From 7f60b8a516e37dd201243ff595eeb8b0f6a0844e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 28 十月 2025 08:47:58 +0800
Subject: [PATCH] 冲突
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 479fe3c..0c3f026 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -717,13 +717,13 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-<<<<<<< HEAD
+
this.splitMx1.Size = new System.Drawing.Size(1437, 570);
this.splitMx1.SplitterPosition = 182;
-=======
+
this.splitMx1.Size = new System.Drawing.Size(1797, 698);
this.splitMx1.SplitterPosition = 213;
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -766,11 +766,11 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);
this.layoutMx1.Root = this.Root;
-<<<<<<< HEAD
+
this.layoutMx1.Size = new System.Drawing.Size(1437, 182);
-=======
+
this.layoutMx1.Size = new System.Drawing.Size(1797, 213);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -1175,11 +1175,11 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
-<<<<<<< HEAD
+
this.Root.Size = new System.Drawing.Size(1437, 182);
-=======
+
this.Root.Size = new System.Drawing.Size(1771, 214);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1326,11 +1326,11 @@
this.layItem100.Name = "layItem100";
this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
-<<<<<<< HEAD
+
this.layItem100.Size = new System.Drawing.Size(354, 34);
-=======
+
this.layItem100.Size = new System.Drawing.Size(437, 38);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.layItem100.Text = "鏁版嵁鏉ユ簮";
this.layItem100.TextSize = new System.Drawing.Size(72, 22);
//
@@ -1390,11 +1390,11 @@
this.layItem101.Name = "layItem101";
this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
-<<<<<<< HEAD
+
this.layItem101.Size = new System.Drawing.Size(354, 34);
-=======
+
this.layItem101.Size = new System.Drawing.Size(437, 38);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.layItem101.Text = "閿�鍞ā寮�";
this.layItem101.TextSize = new System.Drawing.Size(72, 22);
//
@@ -1420,11 +1420,11 @@
this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
-<<<<<<< HEAD
+
this.tabMx.Size = new System.Drawing.Size(1437, 376);
-=======
+
this.tabMx.Size = new System.Drawing.Size(1797, 470);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1435,11 +1435,11 @@
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
-<<<<<<< HEAD
+
this.tabMxPage1.Size = new System.Drawing.Size(1435, 344);
-=======
+
this.tabMxPage1.Size = new System.Drawing.Size(1795, 432);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1460,13 +1460,13 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-<<<<<<< HEAD
+
this.split99.Size = new System.Drawing.Size(1435, 344);
this.split99.SplitterPosition = 132;
-=======
+
this.split99.Size = new System.Drawing.Size(1795, 432);
this.split99.SplitterPosition = 161;
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.split99.TabIndex = 4;
//
// layout99
@@ -1861,11 +1861,11 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
-<<<<<<< HEAD
+
this.gcMx1.Size = new System.Drawing.Size(1435, 200);
-=======
+
this.gcMx1.Size = new System.Drawing.Size(1795, 256);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2139,11 +2139,11 @@
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
-<<<<<<< HEAD
+
this.tabMxPage2.Size = new System.Drawing.Size(1435, 344);
-=======
+
this.tabMxPage2.Size = new System.Drawing.Size(1794, 428);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2154,11 +2154,11 @@
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
-<<<<<<< HEAD
+
this.gcMx2.Size = new System.Drawing.Size(1435, 344);
-=======
+
this.gcMx2.Size = new System.Drawing.Size(1794, 428);
->>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6
+
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
--
Gitblit v1.9.3