From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.resx | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.resx b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.resx
index d58980a..a4826a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.resx
@@ -117,4 +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="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