冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingCtrl.cs

@@ -1,7 +1,4 @@
using DevExpress.Skins;
using DevExpress.Utils.Extensions;
using DevExpress.XtraEditors;
using DevExpress.XtraLayout;
using DevExpress.XtraLayout;
using DevExpress.XtraLayout.Utils;

namespace Yw.WinFrmUI
@@ -22,7 +19,6 @@

        private Yw.Model.HydroModelInfo _hydroInfo = null;//水力信息
        private SetHydroWorkingViewModel _working = null;//工况
        //private SetHydroWorkingBasicCtrl _basicCtrl = null;//基础控件
        private List<ISetHydroWorkingVisualCtrl> _visualCtrlList = null;//可见控件列表

        /// <summary>