From fc9bf0fe5d73cfc171fecc0e4b9e227e78710e37 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 25 二月 2022 12:17:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/WebTM.csproj |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6171e2d..2514906 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,6 +184,7 @@
     <Content Include="views\grf\璁惧妗ｆ.grf" />
     <Content Include="views\grf\鍣ㄥ叿妗ｆ.grf" />
     <Content Include="views\grf\閿�鍞��璐у崟.grf" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鐗╂枡鏉＄爜.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -874,6 +875,7 @@
     <Content Include="views\璐ㄩ噺绠＄悊\妫�楠屾柟妗堝崟\QC_CheckProjectList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\Ji_CallGoodsBillMain.html" />
     <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul.html" />
@@ -1200,6 +1202,7 @@
   <ItemGroup>
     <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
     <Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+    <Folder Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鎷ｆ枡閰嶉�佸崟\" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

--
Gitblit v1.9.1