From fc5a3173f3ac223a91d2ac07497de0cf32fb046e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 07 十一月 2025 14:35:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
index fc44dd5..5160e8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>
\ No newline at end of file

--
Gitblit v1.9.3