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/Warehouse/Frm_MesShouTui.Designer.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 1b8b23e..6f81eea 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -744,7 +744,7 @@
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
-            this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
+            this.layoutControlItem3.Text = "浠g浠撳簱";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9

--
Gitblit v1.9.3