From b24f97de0b8bf86f17f50ac4471dd4c6e24fa22d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 19 六月 2025 08:03:31 +0800
Subject: [PATCH] 修改 SET表 PNL表 展示 编码 ,PNL布局编辑 页面布局1
---
WebTM/WebTM.csproj | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b6ef748..1593d20 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -88,7 +88,6 @@
<Content Include="HtmlPage1.html" />
<Content Include="img\AI鑺墖.png" />
<Content Include="img\ic鑺墖.png" />
- <Content Include="img\鍗庤繙鐩存柟鍥捐儗鏅�.jpeg" />
<Content Include="img\鏅鸿兘鑺墖.png" />
<Content Include="img\鏅鸿兘鑺墖锛�.png" />
<Content Include="img\鐢靛瓙鎶�鏈�.png" />
@@ -660,11 +659,8 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
-<<<<<<< HEAD
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillTotalList.html" />
-=======
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport_His.html" />
->>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
--
Gitblit v1.9.1