From e6a79f899f356f0090bd3385c0bb0aaca7a93a4f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:28:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 80e670d..f587dc2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -230,6 +230,7 @@
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昞Xs_OutDoorCheckBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBill_PDA.html" />
@@ -371,8 +372,12 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeTypeList.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardType.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddressList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatusList.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardTypeList.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
@@ -392,6 +397,7 @@
<Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_Import.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill_KS.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit - 澶嶅埗.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
@@ -1599,6 +1605,7 @@
<Content Include="views\閲囪喘绠＄悊\鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
<Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMainList.html" />
<Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
+ <Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昞Xs_OutDoorCheckBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBill.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBillList.html" />
--
Gitblit v1.9.1