Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs

@@ -1,4 +1,6 @@
namespace Gs.DevApp.DevFrm.JJGZ
using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.JJGZ
{
    partial class Frm_MesJJSalary
    {
@@ -55,7 +57,7 @@
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = 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();
@@ -1022,7 +1024,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;