From 12aa9d6bed791095123108eae5eac33e7e3f72bf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:12:08 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into wxr4
---
HDL_ON/Common/UserInfo.cs | 16 ----------------
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 2 +-
2 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 61ddacf..18d4f19 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -135,22 +135,6 @@
WirteUserinfo(Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
}
- ///// <summary>
- ///// 閫�鍑虹櫥褰曢噸缃弬鏁�
- ///// </summary>
- //public void LogoutReset()
- //{
- // userName = "";
- // ID = "";
- // LoginTokenString = "";
- // RefreshToken = "";
- // userType = "USER_C";
- // LastTime = DateTime.MinValue;
- // headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
- //}
-
- //public string SetLanguage = "";
-
/// <summary>
/// 杞欢瑙ｉ攣鐣岄潰
/// 1:鍚姩鏃�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 79a4845..6fc5a4a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -98,7 +98,7 @@
// {
// d.Add("on_off", "on");
// }
- // fff = !fff;
+ // fff = !fff;
// DriverLayer.Control.Ins.SendWriteCommand(function, d);
// //System.Threading.Thread.Sleep(100);
// }
--
Gitblit v1.8.0