Merge branch 'CJL-NEW'

wxr

2020-12-11 1bb8683aef25143048e572b65734de4772bfc712

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

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

    }