Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

 src/main/java/com/moral/entity/RoleMenu.java

@@ -13,6 +13,8 @@

    private Integer menuId;

    private Integer channelId;

    @Transient
    private Role role;