From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index cae1f2d..c0c7e95 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -36,7 +36,7 @@
Action actionRefresh;
#endregion
- public FunctionBaseInfoSetPage(Function func,Action action)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
@@ -196,6 +196,7 @@
// });
#endregion
+#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
{
@@ -227,7 +228,7 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#endregion
-
+#endif
LoadEventList();
}
--
Gitblit v1.8.0