From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/WebTM.csproj |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2f91a8b..a7cc807 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -206,6 +206,8 @@
     <Content Include="views\home\console_pb.html" />
     <Content Include="views\home\console_QiaoYi.html" />
     <Content Include="views\home\console_Mobile_QiaoYi.html" />
+    <Content Include="views\indexMenu_PDA.html" />
+    <Content Include="views\indexMenu_PingBan.html" />
     <Content Include="views\index_KaiBeiNaiTe.html" />
     <Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
     <Content Include="views\index_Mobile_QiaoYi.html" />
@@ -326,11 +328,15 @@
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
     <Content Include="views\鍝佽川绠$悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PreventErrMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ColorClassList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaintainLev.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodList.html" />
@@ -2135,6 +2141,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
       <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.cs">
+      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
+      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
       <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1