Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

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

@@ -322,6 +322,7 @@
                        {
                            var newSd = new ShareData();
                            newSd.shareTypeId = roomData.shareTypeId;
                            newSd.shareType = roomData.shareType;

                            funs_RoomAll.Add(newSd);
                        }