From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突

---
 WebAPI/WebAPI.csproj |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1e74862..b41c437 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -730,6 +730,7 @@
     <Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
     <Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
     <Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
+    <Compile Include="Controllers\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />

--
Gitblit v1.9.1