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


 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

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

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/pom.xml

	ruoyi-framework/pom.xml

	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

	ruoyi-generator/pom.xml

	ruoyi-job/pom.xml

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java

	ruoyi-system/pom.xml

	ruoyi-ui/package.json

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

	ruoyi-ui/src/utils/request.js

	ruoyi-ui/src/views/index.vue

	ruoyi-ui/src/views/monitor/job/index.vue

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