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


 Conflicts:

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

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

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml

	ruoyi-ui/package.json

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

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

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

	ruoyi-ui/src/components/HeaderSearch/index.vue

	ruoyi-ui/src/components/Screenfull/index.vue

	ruoyi-ui/src/layout/components/Settings/index.vue

	ruoyi-ui/src/layout/components/Sidebar/Logo.vue

	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

	ruoyi-ui/src/layout/components/Sidebar/index.vue

	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

	ruoyi-ui/src/layout/index.vue

	ruoyi-ui/src/main.js

	ruoyi-ui/src/settings.js

	ruoyi-ui/src/store/modules/settings.js

	ruoyi-ui/src/store/modules/user.js

	ruoyi-ui/src/views/login.vue

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

	ruoyi-ui/src/views/system/user/profile/resetPwd.vue

	ruoyi-ui/src/views/system/user/profile/userInfo.vue

	ruoyi-ui/src/views/tool/gen/editTable.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/vue.config.js