Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs

@@ -180,7 +180,7 @@
                    Tag = "ChooseIcon"
                };
                roomView.AddChidren(btnChoose);
                if (shareDatas.Find((obj) => obj.fileName == function.sid) != null)
                if (shareDatas.Find((obj) => obj.shareTypeId == function.deviceId) != null)
                {
                    btnChoose.IsSelected = true;
                }