From 0cc0e66f5bba9ab5d011b94efe214e7c6e134c2a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 四月 2024 15:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e8d4bd1..2602e40 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -417,6 +417,7 @@
     <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
     <Compile Include="Controllers\Pay_ReportController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
     <Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
@@ -484,6 +485,7 @@
     <Compile Include="Controllers\CGGL\YF_PayMentBillController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveBackBillController.cs" />
     <Compile Include="Controllers\CGGL\YF_PayMentOtherBillController.cs" />
+    <Compile Include="Controllers\XSGL\Xs_SeReportController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveOtherBillController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveBillController.cs" />
     <Compile Include="Controllers\XSGL\Kf_SellOutBillController.cs" />
@@ -568,6 +570,7 @@
     <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_GroupEmpBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PurchaseWallclothBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\HR_PostSkillBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
@@ -645,6 +648,7 @@
     <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />
     <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
     <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
     <Compile Include="DLL\ClsGy_SupType_Ctl.cs" />

--
Gitblit v1.9.1