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


 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

	ruoyi-ui/src/api/system/role.js

	ruoyi-ui/src/api/system/user.js

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/router/index.js

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

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