FlowPacs/yudao-framework
YunaiV 174d180abe Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java
#	yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
#	yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/dto/ProductSpuRespDTO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseDbAndRedisIntegrationTest.java
#	yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/test/BaseRedisIntegrationTest.java
2024-05-01 01:09:10 +08:00
..
yudao-common 同步最新代码到简化分支 2024-04-24 22:37:28 +08:00
yudao-spring-boot-starter-biz-data-permission Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-04 10:04:32 +08:00
yudao-spring-boot-starter-biz-ip Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-02 20:38:45 +08:00
yudao-spring-boot-starter-biz-tenant Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-02 20:38:45 +08:00
yudao-spring-boot-starter-excel Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-24 22:32:49 +08:00
yudao-spring-boot-starter-job Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-22 19:02:13 +08:00
yudao-spring-boot-starter-monitor ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
yudao-spring-boot-starter-mq websocket:修复 RedisWebSocketMessageConsumer 注册失效的问题 2023-11-24 18:56:19 +08:00
yudao-spring-boot-starter-mybatis Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-29 00:14:06 +08:00
yudao-spring-boot-starter-protection Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-11 22:45:07 +08:00
yudao-spring-boot-starter-redis 【增强】一键改包:支持 site、org 等包 2024-04-29 00:18:39 +08:00
yudao-spring-boot-starter-security 【增强】一键改包:支持 site、org 等包 2024-04-29 00:18:39 +08:00
yudao-spring-boot-starter-web Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-05-01 01:09:10 +08:00
yudao-spring-boot-starter-websocket Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-12-29 12:49:13 +08:00
pom.xml Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-04-04 02:24:42 +08:00