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

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

 src/main/java/com/moral/service/impl/RoleServiceImpl.java

@@ -148,6 +148,12 @@
                    roleMenu.setChannelId(Integer.valueOf(menuOrder.toString().substring(0, 1)));
                    roleMenu.setMenuId(menuMap.get(menuOrder));
                    roleMenuList.add(roleMenu);
                } else {
                    RoleMenu roleMenu = new RoleMenu();
                    roleMenu.setRoleId(roleId);
                    roleMenu.setChannelId(menuOrder);
                    roleMenu.setMenuId(0);
                    roleMenuList.add(roleMenu);
                }
            }
            roleMenuMapper.insertList(roleMenuList);