Merge branch 'CJL-NEW'

wxr

2020-12-06 6b8177fe424b661687e9fb8119f990c05b054f2b

 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;
                }