Merge remote-tracking branch 'origin/master'

啊鑫

8 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs

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

namespace Gs.DevApp.DevFrm.IPQC
{
    partial class Frm_XunJianDetect01
    {
@@ -76,7 +78,7 @@
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = 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();
@@ -2072,7 +2074,7 @@
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;