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


 Conflicts:

	ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java

	ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java

	ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java

	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

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

	ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

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

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java

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

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java

	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java