Merge branch 'WJC'

wxr

2020-12-09 b5f348ec1381a8b05d00e585a3e156381f751d72

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -33,7 +33,7 @@
            
            DB_ResidenceData.SaveOidList(oidJsonString);
            DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
            DB_ResidenceData.DelAllFunctionData();
            DB_ResidenceData.functionList.DelAllFunctionData();
            foreach (var sidObj in sidObjects)
            {
                var oid = functionOids.Find((o) =>  o.oid == sidObj.sid.Substring(0, 16));