到货单版本冲突

lu

4 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs

@@ -342,7 +342,7 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.lastupdate_date";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 11;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 180;
            // 
            // gridColumn2
@@ -359,8 +359,6 @@
            this.gridColumn3.FieldName = "id";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
@@ -370,7 +368,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 10;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.Width = 94;
            // 
            // pageBar1