From bc0ed5b6cfda6c72c06f451b77da8518c41ab210 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/PBS.WinFrmUI.Hydro/template/Form_EditFloors.Designer.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/template/Form_EditFloors.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/template/Form_EditFloors.Designer.cs
index 71ac170..eb20961 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/template/Form_EditFloors.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/template/Form_EditFloors.Designer.cs
@@ -57,7 +57,7 @@
             groupControl2 = new GroupBox();
             simpleButton10 = new Button();
             simpleButton9 = new Button();
-            comboBox1 = new ComboBox();
+            comboBox1 = new System.Windows.Forms.ComboBox();
             simpleButton6 = new Button();
             simpleButton3 = new Button();
             simpleButton2 = new Button();
@@ -77,7 +77,7 @@
             tb_minFloorIndex = new TextBox();
             groupControl4 = new GroupBox();
             groupControl5 = new GroupBox();
-            comboBox2 = new ComboBox();
+            comboBox2 = new System.Windows.Forms.ComboBox();
             InsertIntoNet = new Button();
             menuStrip1.SuspendLayout();
             groupControl1.SuspendLayout();

--
Gitblit v1.9.3