Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-10-28 cf44d1f213041489c4e86d33946e92881c6fdbd4

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

	ruoyi-ui/src/views/system/dept/index.vue

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

@@ -164,6 +164,6 @@
     */
    private boolean hasPermissions(Set<String> permissions, String permission)
    {
        return permissions.contains(ALL_PERMISSION) || permissions.equals(StringUtils.trim(permission));
        return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
    }
}

 ruoyi-ui/src/views/system/dept/index.vue

@@ -177,7 +177,7 @@
          { required: true, message: "部门名称不能为空", trigger: "blur" }
        ],
        orderNum: [
          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
          { required: true, message: "显示排序不能为空", trigger: "blur" }
        ],
        email: [
          {