Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-11 4a9844ac95e2ff67b2a2b1082c30f15c561866c6

 HDL_ON/Common/UserInfo.cs

@@ -181,7 +181,7 @@
        /// 记录自动化筛选的功能的条件
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string logicselectedFunction;
        public string logicselectedFunction = Language.StringByID(StringId.allFun);

        #endregion