From cc304a3ffc2cd300963e2b7a43f9a810ecb68965 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 09 四月 2024 17:23:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 571c43c..ad8745d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -382,6 +382,8 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsEdit.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
<Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
@@ -458,6 +460,8 @@
<Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMain.html" />
<Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMainList.html" />
<Content Include="views\鐢熶骇绠$悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
+ <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBillList_New.html" />
+ <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫涓嶈壇閲囬泦\Sc_QualityReportStepBill_New.html" />
<Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
<Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
<Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
--
Gitblit v1.9.1