From 5dd7ab9852c9a5659cc916e9ed986b5099efeaf8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 23 十月 2024 13:04:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
index 3998693..fcd362f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj
@@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" />
- <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.3.5" />
+ <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.3.6" />
</ItemGroup>
<ItemGroup>
@@ -100,6 +100,15 @@
<Compile Update="11-prefix\99-failed\HydroCalcuFailedCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="12-bulkset\02-node\01-source\01-reservoir\HydroReservoirBulkSetListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="12-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="12-bulkset\02-node\01-source\02-tank\00-core\HydroTankBulkSetListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@@ -114,4 +123,8 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="12-bulkset\03-link\" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.9.3