From 904e2d128fe0a940e86b1d063bca9531e2f997b8 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 22 十月 2021 13:49:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 604bb6d..19b67e6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
@@ -333,6 +334,7 @@
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\Pay_OtherBalBillController.cs" />
+ <Compile Include="Controllers\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
<Compile Include="Controllers\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
@@ -440,9 +442,13 @@
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Gy_User.cs" />
+ <Compile Include="Models\Gy_UserSupper.cs" />
<Compile Include="Models\Menu.cs" />
<Compile Include="Models\ModelConvertHelper.cs" />
<Compile Include="Models\Pay_OtherBalBill.cs" />
+ <Compile Include="Models\Pay_GroupBalBill.cs" />
+ <Compile Include="Models\Pay_GroupBalBillSub.cs" />
<Compile Include="Models\Pay_WorkTimesBillSub.cs" />
<Compile Include="Models\Pay_WorkTimesBill.cs" />
<Compile Include="Models\Pay_SingleBalBill.cs" />
--
Gitblit v1.9.1