Merge remote-tracking branch 'origin/master'

啊鑫

10 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs

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

namespace Gs.DevApp.DevFrm.Work
{
    partial class Frm_WorkTechniqueShow
    {
@@ -104,7 +106,7 @@
            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panBom = new DevExpress.XtraEditors.PanelControl();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.pageBar1 = new UcPageBar();
            this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
@@ -1191,7 +1193,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;