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


 Conflicts:

	README.md

	pom.xml

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

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

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java

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

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

	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java

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

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java

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

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

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

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

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

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

	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

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

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

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

	ruoyi-ui/src/views/index.vue