From 4bd740c19b356a50a948071ef5caa0bbc0cb52fd Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 15 十一月 2021 17:36:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2c57ce7..0a09079 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -332,6 +332,7 @@
     <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
     <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
@@ -474,6 +475,7 @@
     <Compile Include="Models\Gy_WorkPayType.cs" />
     <Compile Include="Models\QC_POStockInCheckBillSub.cs" />
     <Compile Include="Models\QC_POStockInCheckBill.cs" />
+    <Compile Include="Models\UserPower.cs" />
     <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
     <Compile Include="Models\Xt_DataDictionary_View.cs" />
     <Compile Include="Models\Xt_DataDictionary_Table.cs" />

--
Gitblit v1.9.1