From 9cc9ae240fd351976e6807f252dfcbaf3bfe5241 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期二, 18 十一月 2025 14:25:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 3d6b9ff..e029ed2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.Sales
+namespace Gs.DevApp.DevFrm
{
partial class Frm_SalesReturnNotice
{
@@ -85,7 +82,7 @@
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -2308,7 +2305,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
--
Gitblit v1.9.3