From 3c8e996db701f2744af261e876455754ad182b62 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 09 五月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index 61dd88c..98ee203 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -85,8 +85,8 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.Pump.Core" Version="3.2.2" />
+ <PackageReference Include="NPOI" Version="2.6.0" />
+ <PackageReference Include="Yw.Pump.Core" Version="3.2.4" />
<PackageReference Include="Yw.Service.Phart.Core" Version="3.2.9" />
</ItemGroup>
@@ -135,6 +135,12 @@
<Compile Update="03-valve\02-edit\ValveEditChart.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-valve\TestDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="99-temp\Clipboard\ClipboardCurveTextSelDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3