Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 4e07b25ea19699bd34c6ab146432c4348fd68806

 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml

@@ -32,7 +32,7 @@
        join
        manage_role_menu mrm
        on
        mm.`id` = mrm.`menu_id` and mm.`is_delete`=0
        mm.`id` = mrm.`menu_id` and mrm.`is_delete`=0
        join
        manage_role mr
        on