merge代码错误的

boman-api/boman-domain/src/main/java/com.boman.domain/RoleEnum.java

@@ -1,5 +1,8 @@
 package com.boman.domain;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * @author tjf
  * @Date: 2021/04/22/15:16
@@ -94,45 +97,6 @@ public enum RoleEnum {
         return result;
     }
 
-    /**
-     * 功能描述: 拿到所有的名称 eg: 新增、修改.....
-     *
-     * @param
-     * @return java.util.List<java.lang.String>
-     */
-    public static List<String> names(){
-        RoleEnum[] values = RoleEnum.values();
-        return Arrays.stream(values).map(RoleEnum::getName).collect(Collectors.toList());
-    }
-
-    /**
-     * 功能描述: 拿到所有的roles, 顺序很重要
-     * eg: A、M.....
-     *
-     * @return java.util.List<java.lang.String>
-     */
-    public static List<String> roles(){
-        RoleEnum[] values = RoleEnum.values();
-        return Arrays.stream(values).map(RoleEnum::getRole).collect(Collectors.toList());
-    }
-
-    /**
-     * 功能描述: 拿到所有的roles eg: A、M.....
-     *
-     * @return java.util.List<java.lang.String>
-     */
-    public static List<Map<String, String>> all() {
-        RoleEnum[] values = RoleEnum.values();
-        List<Map<String, String>> result = new ArrayList<>(values.length);
-        for (RoleEnum value : values) {
-            Map<String, String> map = new HashMap<>(2);
-            map.put("name", value.name);
-            map.put("role", value.role);
-            result.add(map);
-        }
-        return result;
-    }
-
    /**
     * 功能描述: 拿到所有的roles eg: A、M.....
     *

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java

@@ -183,6 +183,5 @@ public interface ISysMenuService
      * @return java.lang.String
      */
     List<SysMenu>  listTreeByRoleId(Long roleId);
-    Map<String, Object> listMenus(Long menuId);
 
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleMenuServiceImpl.java

@@ -3,7 +3,6 @@ package com.boman.system.service.impl;
 import com.boman.domain.constant.TableNameConst;
 import com.boman.domain.dto.RoleMenuDto;
 import com.boman.system.api.domain.SysMenu;
-import com.boman.domain.constant.TableNameConst;
 import com.boman.system.domain.SysRoleMenu;
 import com.boman.system.mapper.SysRoleMenuMapper;
 import com.boman.system.service.ISysMenuService;