Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -32,7 +32,7 @@
            var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceModule>>(obj.GetValue("objects").ToString());
            
            DB_ResidenceData.SaveOidList(oidJsonString);
            FunctionList.List.Clear();
            FunctionList.List.ClearDatas();
            foreach (var sidObj in sidObjects)
            {
                var oid = functionOids.Find((o) =>  o.oid == sidObj.sid.Substring(0, 16));