冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/19-exchanger/HydroExchangerListCtrl.Designer.cs

@@ -42,6 +42,7 @@
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
            colResistanceMode = new DevExpress.XtraGrid.Columns.GridColumn();
            colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
            colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,7 +68,6 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            colResistanceMode = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroExchangerViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -148,6 +148,16 @@
            colModelType.Visible = true;
            colModelType.VisibleIndex = 3;
            colModelType.Width = 100;
            // 
            // colResistanceMode
            // 
            colResistanceMode.FieldName = "ResistanceMode";
            colResistanceMode.MaxWidth = 100;
            colResistanceMode.MinWidth = 100;
            colResistanceMode.Name = "colResistanceMode";
            colResistanceMode.Visible = true;
            colResistanceMode.VisibleIndex = 4;
            colResistanceMode.Width = 100;
            // 
            // colMaterial
            // 
@@ -410,13 +420,6 @@
            layoutControlItem9.Size = new Size(1326, 543);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            // 
            // colResistanceMode
            // 
            colResistanceMode.FieldName = "ResistanceMode";
            colResistanceMode.Name = "colResistanceMode";
            colResistanceMode.Visible = true;
            colResistanceMode.VisibleIndex = 4;
            // 
            // HydroExchangerListCtrl
            //