疯狂的狮子li 896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java

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

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

2021-08-17 14:23:19 +08:00

..

aspectj

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

2021-08-17 14:23:19 +08:00

captcha

update 日常校验 统一重构到 StringUtils 便于维护扩展

2021-08-02 19:28:41 +08:00

config

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

2021-08-17 14:23:19 +08:00

interceptor

update 日常校验 统一重构到 StringUtils 便于维护扩展

2021-08-02 19:28:41 +08:00

jackson

update 更新 BigNumberSerializer 书写错误

2021-07-29 15:09:23 +08:00

manager

update 日常字符串校验 统一重构到 StringUtils 便于维护扩展

2021-08-02 12:15:14 +08:00

mybatisplus

update 同步 ruoyi 适配改动

2021-08-17 10:45:01 +08:00

security

update 日常校验 统一重构到 StringUtils 便于维护扩展

2021-08-02 19:28:41 +08:00

web

update 同步 ruoyi 适配改动

2021-08-17 10:45:01 +08:00