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

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs

@@ -74,7 +74,10 @@
                            }
                        }
                        DB_ResidenceData.residenceData.DelRoom(room);
                        backAction();
                        // backAction();
                        // DB_ResidenceData.DelRoom(room);
                        //删除事件回调
                        this.deleteAction?.Invoke();
                        this.RemoveFromParent();
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);