From e261e4ab0848bcdd36aafe63e6835eac723270f1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 八月 2022 18:16:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cae0eff..3ceef40 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -216,6 +216,7 @@
<Content Include="views\grf\宸ュ簭娴佽浆.grf" />
<Content Include="views\grf\cabinet-CG.grf" />
<Content Include="views\grf\鐟炰笌绁烘睙鑻忔墦鍗版ā鏉�.grf" />
+ <Content Include="views\grf\cabinet-SB.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -625,6 +626,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx" />
@@ -785,6 +787,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFileResume.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sb_Add_MouldRepairWorkBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldConkBookBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
@@ -936,6 +939,7 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
<Content Include="views\璁惧绠＄悊\Sc_Add_MouldDotCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileBillResume.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFileMainList.html" />
<Content Include="views\璁惧绠＄悊\璁惧缁翠慨娲惧伐鍗昞Sb_EquipRepairSendWorkBillEdit.html" />
@@ -1141,6 +1145,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_HEquipResumeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
<DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1