From 8b8c26398639c86d4a8a94a7afdfca0785837685 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:27:20 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 2500e6d..cfbd179 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -162,20 +162,16 @@
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
-<<<<<<< Updated upstream
+
this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-<<<<<<< HEAD
-=======
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
-=======
+
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
->>>>>>> Stashed changes
->>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
+
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1565,12 +1561,7 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
-<<<<<<< HEAD
-=======
-<<<<<<< Updated upstream
-<<<<<<< HEAD
->>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
// ucRptCgdhd1
//
this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1580,9 +1571,7 @@
this.ucRptCgdhd1.TabIndex = 0;
// txt_mxStatue
-=======
- // gridColumn23
->>>>>>> Stashed changes
+
//
this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
this.gridColumn23.FieldName = "鍒拌揣鏁伴噺";
@@ -1604,18 +1593,14 @@
//
// gridColumn25
//
-<<<<<<< Updated upstream
+
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
-<<<<<<< HEAD
-=======
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
-=======
this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
this.gridColumn25.FieldName = "鍏ュ簱鏁伴噺";
this.gridColumn25.MinWidth = 30;
@@ -1633,8 +1618,7 @@
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 18;
this.gridColumn26.Width = 112;
->>>>>>> Stashed changes
->>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
+
//
// Frm_MesInvItemArn
//
@@ -1820,17 +1804,11 @@
private DevExpress.XtraEditors.TextEdit txt_mxStatue;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-<<<<<<< HEAD
-=======
-<<<<<<< Updated upstream
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
-=======
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
->>>>>>> Stashed changes
->>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3