From 2b5ec880caa782118b087bd49834d3b8dc766095 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期日, 28 四月 2024 17:33:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cc230f9..bd0c037 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -111,7 +111,6 @@
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<Content Include="layuiadmin\layui\font\iconfont.woff2" />
<Content Include="layuiadmin\json\Test.json" />
- <None Include="packages.config" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
<Content Include="layuiadmin\layui\images\device.png" />
<Content Include="layuiadmin\layui\images\erro.png" />
@@ -281,6 +280,7 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閲囪喘鍏ュ簱\Kf_POStockInBillList_PDA.html" />
@@ -320,9 +320,11 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ProjectClass.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ColorClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PoStockStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CusType.html" />
@@ -340,8 +342,6 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectMethod.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_InspectValue.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
- <Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_ProjectClass.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_InspectBasis.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType.html" />
--
Gitblit v1.9.1