From e9c383fe6a79fab1ef58107bda1b88808b5ad00c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 05 八月 2025 09:30:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4871a63..a275b16 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -449,6 +449,7 @@
     <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" />
@@ -467,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" />
@@ -616,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