From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 26 七月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
index 1d1bd31..5d7d4d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -50,7 +50,7 @@
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1292, 662);
+            this.gcMain.Size = new System.Drawing.Size(1025, 662);
             this.gcMain.TabIndex = 6;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -121,7 +121,7 @@
             this.panelControl1.Location = new System.Drawing.Point(0, 662);
             this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1292, 53);
+            this.panelControl1.Size = new System.Drawing.Size(1025, 53);
             this.panelControl1.TabIndex = 9;
             // 
             // btnIn
@@ -130,7 +130,7 @@
             this.btnIn.Appearance.Options.UseBackColor = true;
             this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
-            this.btnIn.Location = new System.Drawing.Point(1172, 2);
+            this.btnIn.Location = new System.Drawing.Point(905, 2);
             this.btnIn.Margin = new System.Windows.Forms.Padding(4);
             this.btnIn.Name = "btnIn";
             this.btnIn.Size = new System.Drawing.Size(118, 49);
@@ -141,14 +141,14 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1292, 715);
+            this.ClientSize = new System.Drawing.Size(1025, 715);
             this.Controls.Add(this.gcMain);
             this.Controls.Add(this.panelControl1);
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "SelectSTAFF";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "鐢熶骇閫�鏂欑敵璇凤紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
+            this.Text = "閫夋嫨鍛樺伐";
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();

--
Gitblit v1.9.3