From ab93f39bbea15453435eae8de54cc64846130fb1 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 19 十二月 2024 16:17:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
index 44fcb0b..dfbaaa1 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
@@ -82,6 +82,15 @@
     <Compile Update="01-pump\02-edit\PumpChartEditCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Update="01-pump\03-import\01-excel\PumpChartExcelImportCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="01-pump\03-import\02-image\UniversalChartImageImportCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="01-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Update="02-universal\02-edit\UniversalChartEditCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -112,12 +121,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="01-pump\03-import\01-excel\" />
-    <Folder Include="01-pump\03-import\02-image\" />
-    <Folder Include="01-pump\03-import\03-point\" />
   </ItemGroup>
 
 </Project>

--
Gitblit v1.9.3