Merge remote-tracking branch 'origin/master'

啊鑫

7 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs

@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm

using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.Warehouse
{
    partial class Frm_InitialBarcode
    {
@@ -55,7 +58,7 @@
            this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemUnit = 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();
@@ -967,7 +970,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;