Merge branch 'dev' into lss

lss

2022-05-17 49248e3bdff0458f8f6f4156d1425bd6f6074e32

 HDL_ON/Common/UserInfo.cs

@@ -160,6 +160,29 @@
            }
        }

        [Newtonsoft.Json.JsonIgnore]
        public DateTime LastTimeOpenDoor = DateTime.MinValue;
        public bool VerOpenDoorPw
        {
            get
            {
                return (DateTime.Now - LastTime).TotalMinutes > 5;
            }
        }
        [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>