From 59e60a1b112f7ff35c82a1444e2bd9c69b179090 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 21 十月 2021 19:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a2244a2..32808d0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -74,6 +74,7 @@
<Content Include="layuiadmin\layui\images\erro.png" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
+ <Content Include="layuiadmin\modules\transfer.js" />
<Content Include="layuiadmin\myicon\win.svg" />
<Content Include="layuiadmin\myicon\yidongduan.svg" />
<Content Include="layuiadmin\myicon\淇敼瀵嗙爜.svg" />
@@ -106,10 +107,13 @@
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
<Content Include="views\indexMenu.html" />
+ <Content Include="views\PublicPage\OrderBackInfomation.html" />
+ <Content Include="views\PublicPage\OrderLevInformation.html" />
<Content Include="views\PublicPage\Gy_MaterType.html" />
<Content Include="views\PublicPage\CheckItemInformation.html" />
<Content Include="views\PublicPage\Gy_Maintain.html" />
<Content Include="views\PublicPage\Organizations.html" />
+ <Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
@@ -558,6 +562,8 @@
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
+ <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_Table.html" />
+ <Content Include="views\鍩虹璧勬枡\鏁版嵁瀛楀吀\Xt_DataDictionary_TableList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
@@ -694,6 +700,7 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserGroupList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserListEdit.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameter_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\绯荤粺鍙傛暟绠＄悊\Xt_SystemParameterList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBill.html" />
--
Gitblit v1.9.1