From 025a61a9b52d5cdea1a948f1432ce524b2248e5c Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 25 二月 2026 14:00:48 +0800
Subject: [PATCH] 成本分配类型增加子表

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

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b006e73..0750eb1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -668,10 +668,9 @@
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostProjectImport.html" />
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_CostAccounting.html" />
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBillImport.html" />
-<<<<<<< HEAD
-=======
+
     <Content Include="views\鎴愭湰绠＄悊\璐圭敤鍗曞紩鍏CB_ItemMoneyBill_Excel.html" />
->>>>>>> 50ceb8be38852f1a32825a7d172bd9a4d4db241d
+
     <Content Include="views\鏉＄爜鏄庣粏\Kf_MateOutBillList_CodeDetail.html" />
     <Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport_ForPCSCheckNote.html" />
     <Content Include="views\妗堜緥浠ｇ爜\鍗庤繙\HY_HistogramReport.html" />

--
Gitblit v1.9.1