Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

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

@@ -1,5 +1,7 @@

namespace Gs.DevApp.DevFrm
using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.BasicData
{
    partial class Frm_Department
    {
@@ -57,7 +59,7 @@
            this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = 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();
@@ -714,7 +716,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.Label lbGuid;