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


 Conflicts:

	pom.xml

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

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

	ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java

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

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

	ruoyi-ui/package.json

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