SVN r1208
SVN-Revision: r1208
This commit is contained in:
@@ -301,6 +301,7 @@ namespace Lskj.Main.Control
|
|||||||
if (HiddenAccountSet && (SystemInfo.Instance.DefaultMainTag == 3 || SystemInfo.Instance.DefaultMainTag == 4))
|
if (HiddenAccountSet && (SystemInfo.Instance.DefaultMainTag == 3 || SystemInfo.Instance.DefaultMainTag == 4))
|
||||||
{
|
{
|
||||||
pl_top_right.Width = pl_top_right.Width - this.label1.Left - this.label1.Width;
|
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)
|
if (SystemInfo.Instance.HideSkin)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ namespace Lskj.Main
|
|||||||
if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.WatermarkContent))
|
if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.WatermarkContent))
|
||||||
{
|
{
|
||||||
content = ReplaceHelper.ReplaceUserInfo(SystemInfo.Instance.WatermarkContent);
|
content = ReplaceHelper.ReplaceUserInfo(SystemInfo.Instance.WatermarkContent);
|
||||||
|
content=content.Replace("{loginMac}", ERPInfo.Instance.MacAddress + "", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(content))
|
if (!string.IsNullOrEmpty(content))
|
||||||
|
|||||||
Reference in New Issue
Block a user