From ffcef3d87676ebaf7f22413711b57bbe0404b3f2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 八月 2025 16:17:21 +0800
Subject: [PATCH] 冲突分支合并 2025-08-12 16:17
---
WebAPI/WebAPI.csproj | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 312fef9..a275b16 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -449,7 +449,9 @@
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -466,6 +468,7 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Sc_PackUnionBillMain_SettoPackingController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" />
+ <Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeReportController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\QC_CheckNote_PNL_TempController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\HY_DataMappingController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\鍩虹璧勬枡\Gy_BaseInformationController.cs" />
@@ -615,6 +618,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethodController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClassController.cs" />
--
Gitblit v1.9.1