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

wjc

2022-03-23 2b9a266168793da88a6e615fb961c254698dc12c

 HDL_ON/Common/UserInfo.cs

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

        #endregion