From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ee12a95..181a571 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -554,6 +554,7 @@
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackaging.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+    <Content Include="views\杞﹂棿绠$悊\浜х嚎\MES_WhiteLabelGeneration.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\ProcessWIPReport.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\RetrospectionCustomerReport.html" />
     <Content Include="views\杞﹂棿绠$悊\浜х嚎\Sc_GroupOrderBill.html" />
@@ -1142,6 +1143,7 @@
     <Content Include="views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
     <Content Include="views\grf\閫佽揣鍗�.grf" />
     <Content Include="views\grf\鍙栨牱鍗�.grf" />
+    <Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>

--
Gitblit v1.9.1