From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
Model/Model.csproj | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index d3319e1..e5bc186 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -162,6 +162,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_EnvironmentTestItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfoSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" />
--
Gitblit v1.9.1