From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突

---
 DevApp/Gs.DevApp/XtraForm2.resx |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx b/DevApp/Gs.DevApp/XtraForm2.resx
similarity index 100%
copy from DevApp/Gs.DevApp/DevFrm/Work/Frm_Work09.resx
copy to DevApp/Gs.DevApp/XtraForm2.resx

--
Gitblit v1.9.3