From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/Common/UserInfo.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 2f98571..5ba0686 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -172,6 +172,17 @@
[Newtonsoft.Json.JsonIgnore]
public string doorPasswordString;
+ /// <summary>
+ /// 璁板綍鑷姩鍖栫瓫閫夌殑鎴块棿鐨勬潯浠�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public Entity.Room logicselectedRoom = new Entity.Room { roomId = "6688",roomName = Language.StringByID(StringId.allAreas) };
+ /// <summary>
+ /// 璁板綍鑷姩鍖栫瓫閫夌殑鍔熻兘鐨勬潯浠�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string logicselectedFunction = Language.StringByID(StringId.allFun);
+
#endregion
/// <summary>
--
Gitblit v1.8.0