From c0ea121256e4c23dba0efda571269c706766126a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 08 十二月 2021 19:13:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 64c2ae3..2418e11 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -352,7 +352,7 @@
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_GroupBalBillController.cs" />
     <Compile Include="Controllers\PurchaseOrderController.cs" />
     <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
-    <Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
     <Compile Include="Controllers\PublicPageMethodController.cs" />
@@ -447,6 +447,7 @@
     <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_GroupBalBill.cs" />
+    <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_WorkTimesBill.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillEmp.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillMain.cs" />
     <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillSub.cs" />
@@ -611,6 +612,8 @@
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
+    <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillMain.cs" />
+    <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_WorkTimesBillSub.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

--
Gitblit v1.9.1