From 69323cd646d8a8b10d8dc4998ba7aa4113e6b10c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 13 十一月 2025 15:52:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx
index 1af7de1..e7132ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.resx
@@ -117,4 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>
\ No newline at end of file

--
Gitblit v1.9.3