From f8aa2c12c15742a3589fda9bb2803c5211a842bd Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Wed, 10 Jun 2026 10:44:33 +0000
Subject: [PATCH] SVN r1208

SVN-Revision: r1208
---
 插件库/Lskj.Main/Control/MainPanelControlEx.cs | 1 +
 插件库/Lskj.Main/FrmWatermark.cs               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
index e992cc1..b2e047e 100644
--- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
@@ -301,6 +301,7 @@ namespace Lskj.Main.Control
                 if (HiddenAccountSet && (SystemInfo.Instance.DefaultMainTag == 3 || SystemInfo.Instance.DefaultMainTag == 4))
                 {
                     pl_top_right.Width = pl_top_right.Width - this.label1.Left - this.label1.Width;
+                    this.lblMenuTitle.Location= new Point(this.button3.Left , this.lblMenuTitle.Top);
                 }
                 if (SystemInfo.Instance.HideSkin)
                 {
diff --git a/插件库/Lskj.Main/FrmWatermark.cs b/插件库/Lskj.Main/FrmWatermark.cs
index f28f07b..473f6fe 100644
--- a/插件库/Lskj.Main/FrmWatermark.cs
+++ b/插件库/Lskj.Main/FrmWatermark.cs
@@ -121,6 +121,7 @@ namespace Lskj.Main
                 if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.WatermarkContent))
                 {
                     content = ReplaceHelper.ReplaceUserInfo(SystemInfo.Instance.WatermarkContent);
+                    content=content.Replace("{loginMac}", ERPInfo.Instance.MacAddress + "", true);
                 }
 
                 if (!string.IsNullOrEmpty(content))