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


 Conflicts:

	pom.xml

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

	ruoyi-admin/src/main/resources/i18n/messages.properties

	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

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

	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

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

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

	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

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

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

	ruoyi-generator/src/main/resources/vm/java/service.java.vm

	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

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

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

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

	ruoyi-ui/src/api/login.js

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/utils/zipdownload.js

	ruoyi-ui/src/views/index.vue

	ruoyi-ui/src/views/login.vue

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