From 12a1ad9f234738d6153b26626a0cc85b0f7b96a7 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 04 二月 2021 21:11:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/WebTM
---
WebTM/WebTM.csproj | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 04da1d9..4709022 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -256,6 +256,7 @@
<None Include="layuiadmin\Scripts\jquery-1.4.1-vsdoc.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.js" />
<Content Include="layuiadmin\Scripts\jquery-1.4.1.min.js" />
+ <Content Include="layuiadmin\Scripts\jquery-3.5.1.min.js" />
<Content Include="layuiadmin\Scripts\json2.js" />
<Content Include="layuiadmin\Scripts\webConfig.js" />
<Content Include="layuiadmin\style\admin.css" />
@@ -416,6 +417,8 @@
<Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
<Content Include="views\浠撳簱璋冩嫧\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
+ <Content Include="views\鍩虹璧勬枡\H_ProcessDetail.html" />
+ <Content Include="views\鍩虹璧勬枡\H_ProcessList.html" />
<Content Include="views\宸ュ簭姹囨姤\MES_StationInBill_PDA.html" />
<Content Include="views\宸ュ簭姹囨姤\MES_StationInBill.html" />
<Content Include="views\宸ュ簭姹囨姤\MES_StationInBillList.html" />
--
Gitblit v1.9.1