From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
index 06dca84..2efe221 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -128,7 +128,6 @@
//
// btnEsc
//
-
this.btnEsc.Appearance.Options.UseFont = true;
this.btnEsc.Dock = System.Windows.Forms.DockStyle.Right;
this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
@@ -141,7 +140,6 @@
// btnQuery
//
this.btnQuery.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-
this.btnQuery.Appearance.Options.UseBackColor = true;
this.btnQuery.Appearance.Options.UseFont = true;
this.btnQuery.Dock = System.Windows.Forms.DockStyle.Right;
@@ -574,6 +572,7 @@
this.repositoryItemComboBox3Sql.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemComboBox3Sql.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
"瀛楃涓茬被鍨�",
"鏁板�肩被鍨�",
"鏃堕棿绫诲瀷",
--
Gitblit v1.9.3