Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs

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

using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.Sales
{
    partial class Frm_SalesDeliver
    {
@@ -69,7 +72,7 @@
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.pageBar1 = new UcPageBar();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1755,7 +1758,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_fNote;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;