From 926d7b9567c444975e972518ba2fcb4d82a93345 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 09 十一月 2021 16:43:36 +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 54537df..2c57ce7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,7 +278,9 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+    <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" />
@@ -448,6 +450,7 @@
     <Compile Include="Models\ClsGy_RepairCheck.cs" />
     <Compile Include="Models\ClsOA_InformBillMain.cs" />
     <Compile Include="Models\ClsOA_InformBillSub.cs" />
+    <Compile Include="Models\Pay_PeriodInfoSet.cs" />
     <Compile Include="Models\Gy_OrderBackInfo.cs" />
     <Compile Include="Models\Gy_OrderLevList.cs" />
     <Compile Include="Models\ClsGy_EquipFileMain.cs" />
@@ -554,6 +557,7 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />

--
Gitblit v1.9.1