From 93b9f26c4581fa9d39f064a453fc21a67d582152 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 28 六月 2022 08:46:12 +0800
Subject: [PATCH] 合并

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 316c1da..2aeedcf 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -233,6 +233,7 @@
     <Content Include="Index.html" />
     <Content Include="Views\Scripts\bootstrap.js" />
     <Content Include="Views\Scripts\bootstrap.min.js" />
+    <Content Include="Config\kdapi.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -349,6 +350,7 @@
     <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
     <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
     <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -752,6 +754,7 @@
     <Compile Include="Service\ProcessDal.cs" />
     <Compile Include="Service\YqnDal.cs" />
     <Compile Include="Service\YqnQbService.cs" />
+    <Compile Include="Utility\Util.cs" />
     <Compile Include="Web References\WebS\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -845,6 +848,7 @@
     <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
     <Folder Include="Views\Sc_WorkBillSortBill\" />
     <Folder Include="Views\Sc_WorkDemandPlanBill\" />
+    <Folder Include="Views\Xt_grdAlignment_WMES\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />

--
Gitblit v1.9.1