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

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

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