From 734ba49ea1c7e3a1b6b3d5edbc023842339a82a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:25:09 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 24021d6..c0db135 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -152,19 +152,16 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
-<<<<<<< HEAD
this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
-=======
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1518,7 +1515,7 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
-<<<<<<< HEAD
+
// ucRptCgdhd1
//
this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1526,7 +1523,7 @@
this.ucRptCgdhd1.Name = "ucRptCgdhd1";
this.ucRptCgdhd1.Size = new System.Drawing.Size(1573, 570);
this.ucRptCgdhd1.TabIndex = 0;
-=======
+
// txt_mxStatue
//
this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);
@@ -1558,7 +1555,7 @@
this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
+
//
// Frm_MesInvItemArn
//
@@ -1735,15 +1732,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-<<<<<<< HEAD
+
private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
private Rpt.UcRptCgdhd ucRptCgdhd1;
-=======
+
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraEditors.TextEdit txt_mxStatue;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
->>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3