From e4f1a927520a98fbc69dd63ef982dd890ba4fbdc Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 03 七月 2025 11:14:26 +0800
Subject: [PATCH] 合并分支

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c01174f..30cb663 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -463,6 +463,7 @@
     <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
     <Compile Include="Controllers\浜轰簨绠$悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\Kf_MoveStockBillController.cs" />
+    <Compile Include="Controllers\浠撳瓨绠$悊\Sc_PackUnionBillMain_SettoPackingController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\鐢熶骇棰嗘枡\Kf_ProductReceiveMaterialBillController.cs" />
     <Compile Include="Controllers\鍗庤繙datamapping\QC_CheckNote_PNL_TempController.cs" />
     <Compile Include="Controllers\鍗庤繙datamapping\HY_DataMappingController.cs" />
@@ -885,6 +886,7 @@
     <Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
     <Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
     <Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
     <Compile Include="Models\Employee.cs" />
     <Compile Include="Models\Gy_UserCustomer.cs" />

--
Gitblit v1.9.1