From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index a8aaa07..f509245 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -1,4 +1,6 @@
-锘縩amespace Gs.DevApp.DevFrm.Work
+锘縰sing 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;

--
Gitblit v1.9.3