From 073aca8ebc3f025a3b1678a0fb83a697276561a5 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 20 八月 2021 15:23:32 +0800
Subject: [PATCH] 合并

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c938fd..8ad5cb5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,9 +105,13 @@
     <Content Include="views\grf\a.grf" />
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
+    <Content Include="views\PublicPage\Gy_MaterType.html" />
+    <Content Include="views\PublicPage\CheckItemInformation.html" />
+    <Content Include="views\PublicPage\Gy_Maintain.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -507,6 +511,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Unit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EmployeeList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckItem.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QCCheckClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent_Edit.html" />
@@ -596,6 +601,7 @@
     <Content Include="views\鐢熶骇宸ュ簭绠$悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />

--
Gitblit v1.9.1