Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs

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

using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.WW
{
    partial class Frm_WwTblDj
    {
@@ -65,7 +68,7 @@
            this.gv_cbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.bandedGridColumn4 = 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();
@@ -1390,7 +1393,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_cbillNo;
        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn4;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;