From 3720316038d2d2e283d9ef3c4385b76c2b4ada34 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 15:29:45 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 05dd37d..205874c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -374,11 +374,8 @@
 		<Compile Update="03-simulation\11-pump\05-edit\SimulationPumpCurveEditDlg.cs">
 		  <SubType>Form</SubType>
 		</Compile>
-		<Compile Update="03-simulation\13-print\99-test\XtraForm1.cs">
+		<Compile Update="03-simulation\13-print\report\SimulationCommonReportDlg.cs">
 		  <SubType>Form</SubType>
-		</Compile>
-		<Compile Update="03-simulation\13-print\99-test\XtraReport1.cs">
-		  <SubType>XtraReport</SubType>
 		</Compile>
 		<Compile Update="eMatchingDlg.cs" />
 		<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />

--
Gitblit v1.9.3