From e8232071737c1c0fcafcb474d063c341caf9fced Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 23 七月 2021 17:13:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 972565b..295c3c0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -82,6 +82,7 @@
     <Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
     <Content Include="layuiadmin\myicon\杞﹂棿绠$悊.svg" />
     <Content Include="layuiadmin\treeTable.js" />
+    <Content Include="layuiadmin\PubCustom.js" />
     <Content Include="views\Baseset\HBarPlanPrint.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
@@ -649,8 +650,6 @@
     <Content Include="views\璐ㄩ噺绠$悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\濮斿宸ュ簭鎺ユ敹鍗昞Cj_StationEntrustOutBill_PDA.html" />
-    <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
-    <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />

--
Gitblit v1.9.1