疯狂的狮子Li 4e0648171c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud ...

 Conflicts:

	pom.xml

	ruoyi-common/ruoyi-common-core/pom.xml

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

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java

	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java

	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java

	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

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

	sql/ry_config_20220510.sql

2022-05-28 22:17:33 +08:00

..

ruoyi-gen

升级fastjson到最新版2.0.4

2022-05-26 10:04:13 +08:00

ruoyi-job

发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能

2022-05-10 14:54:53 +08:00

ruoyi-resource

update 优化 oss 回显查询 使用 redis 缓存

2022-05-27 09:59:39 +08:00

ruoyi-system

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

2022-05-28 22:17:33 +08:00

pom.xml

发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能

2022-05-10 14:54:53 +08:00