From e72f34545b96332b8bff76294b7d397630139d9c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 13 九月 2025 16:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index b95c785..1021b3b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -40,6 +40,7 @@
             this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -99,7 +100,8 @@
             this.gv_operationTime,
             this.gv_operationTable,
             this.gv_msg,
-            this.gv_userName});
+            this.gv_userName,
+            this.gridColumn1});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -129,7 +131,7 @@
             this.gv_operationTable.OptionsColumn.AllowEdit = false;
             this.gv_operationTable.Tag = "query_OPERATION_TABLE";
             this.gv_operationTable.Visible = true;
-            this.gv_operationTable.VisibleIndex = 1;
+            this.gv_operationTable.VisibleIndex = 2;
             this.gv_operationTable.Width = 100;
             // 
             // gv_msg
@@ -142,21 +144,31 @@
             this.gv_msg.OptionsColumn.AllowEdit = false;
             this.gv_msg.Tag = "query_MSG";
             this.gv_msg.Visible = true;
-            this.gv_msg.VisibleIndex = 2;
+            this.gv_msg.VisibleIndex = 3;
             this.gv_msg.Width = 200;
             // 
             // gv_userName
             // 
             this.gv_userName.AppearanceCell.Options.UseFont = true;
             this.gv_userName.Caption = "鍚屾鏃堕棿";
-            this.gv_userName.FieldName = "edtTime";
+            this.gv_userName.FieldName = "synchronousDate";
             this.gv_userName.MinWidth = 10;
             this.gv_userName.Name = "gv_userName";
             this.gv_userName.OptionsColumn.AllowEdit = false;
             this.gv_userName.Tag = "query_USER_NAME";
             this.gv_userName.Visible = true;
-            this.gv_userName.VisibleIndex = 3;
+            this.gv_userName.VisibleIndex = 4;
             this.gv_userName.Width = 250;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "缁勭粐ID";
+            this.gridColumn1.FieldName = "fid";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 1;
+            this.gridColumn1.Width = 94;
             // 
             // Organization
             // 
@@ -187,5 +199,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
         private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3