From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
Model/Model.csproj | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index e2d7b9e..d3319e1 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -98,6 +98,7 @@
<Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
<Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
+ <Compile Include="浠撳簱绠＄悊\ClsKf_WorkShopICStockBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MaintainClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPeMaterial_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPe_Model.cs" />
--
Gitblit v1.9.1