From ce0366bb8db4f9665e715b8647df6eb15fa07f68 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 25 一月 2024 14:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 98a45ec..4d6539a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,8 +342,6 @@
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
<Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -443,8 +441,6 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
- <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
<Compile Include="Controllers\MateOutController.cs" />
@@ -532,7 +528,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjGroupController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -542,7 +540,7 @@
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
- <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
--
Gitblit v1.9.1