From 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:41:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5903f0f..7028172 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -347,10 +347,16 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Customer_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Department_excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Warehouse_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_RestDay.html" />
@@ -378,6 +384,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonList_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheck_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
--
Gitblit v1.9.1