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/Frm_MesJJSalary.Designer.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
index b6d56f5..e8f5d26 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
@@ -910,7 +910,7 @@
             this.Controls.Add(this.toolBarMenu1);
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_MesJJSalary";
-            this.Text = "璁℃椂宸ヨ祫";
+            this.Text = "璁′欢鍗曚环";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);

--
Gitblit v1.9.3