From 5d8b95b69c1bf800f2a2ebee62c6f7181c0bd7c8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 16:35:46 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
index 1d1841b..df21923 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
@@ -61,6 +61,15 @@
<Compile Update="18-loss\02-scale\HydroSingleLossScaleCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="19-pump\01-run\HydroPumpRunListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="20-energy\01-statistics\HydroEnergyStatisticsBarCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="20-energy\02-total\HydroEnergyTotalViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="99-view\01-q3d\HydroQ3dViewPage.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3