Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-11 82423359112f65458fd9a80418da0bda5e9364d9

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -46,7 +46,7 @@
                }
                DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
            }
            MainPage.GoUserPage();
            //MainPage.GoUserPage();
        }

    }