Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs

@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm

using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.WOM
{
    partial class Frm_Wompba
    {
@@ -59,7 +62,7 @@
            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.pageBar1 = new UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1166,7 +1169,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;