Merge remote-tracking branch 'origin/master'

啊鑫

8 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs

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

namespace Gs.DevApp.DevFrm.Ck
{
    partial class Frm_MesYanTui
    {
@@ -56,7 +58,7 @@
            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = 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();
@@ -1181,7 +1183,7 @@
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;