Merge remote-tracking branch 'origin/master'

啊鑫

10 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

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

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

namespace Gs.DevApp.DevFrm.Work
{
    partial class Frm_WorkTechnique
    {
@@ -45,7 +47,7 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WorkTechnique));
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.pageBar1 = new UcPageBar();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -1263,7 +1265,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private System.Windows.Forms.Label lbGuid;