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

wxr

2022-03-15 0883f3177bac1dc56d912c16cdf0cff6efc606e6

 HDL_ON/Common/UserInfo.cs

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

        #endregion