From 21dad2a2c73262cd6787bf78b4806de0b8b20bac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 29 五月 2025 09:20:53 +0800
Subject: [PATCH] 合并冲突 2025-5-29 9:20
---
WebAPI/WebAPI.csproj | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 53ec3c4..1e74862 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -726,6 +726,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
+ <Compile Include="Controllers\鏁版嵁鍚屾\灏忚钁涘悓姝XZG_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
--
Gitblit v1.9.1