You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
..
yudao-common Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
yudao-spring-boot-starter-banner fix: banner 日志打印 3 years ago
yudao-spring-boot-starter-biz-data-permission 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/51/files 2 years ago
yudao-spring-boot-starter-biz-dict mall + product:完善商品详情接口 3 years ago
yudao-spring-boot-starter-biz-error-code code review:分销逻辑 2 years ago
yudao-spring-boot-starter-biz-ip 修复单元测试报错 3 years ago
yudao-spring-boot-starter-biz-operatelog !514 mall交易日志封装 3 years ago
yudao-spring-boot-starter-biz-pay Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
yudao-spring-boot-starter-biz-sms 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor 2 years ago
yudao-spring-boot-starter-biz-social Merge remote-tracking branch 'origin/master' into feature/auth 2 years ago
yudao-spring-boot-starter-biz-tenant 1. 禁用 member 模块 2 years ago
yudao-spring-boot-starter-biz-weixin 优化 mp-java 库的依赖管理 3 years ago
yudao-spring-boot-starter-captcha 彻底移除 RedisKeyDefine 3 years ago
yudao-spring-boot-starter-desensitize 优化脱敏组件的注释 3 years ago
yudao-spring-boot-starter-excel mall + pay: 3 years ago
yudao-spring-boot-starter-file 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor 2 years ago
yudao-spring-boot-starter-flowable bpm:优化 BpmnModelUtils 2 years ago
yudao-spring-boot-starter-job 默认禁用 quartz 依赖,保证启动速度 2 years ago
yudao-spring-boot-starter-monitor feat: 适配springboot 2.7 configuration ==> AutoConfiguration 3 years ago
yudao-spring-boot-starter-mq 基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快 3 years ago
yudao-spring-boot-starter-mybatis 修改Review代码 2 years ago
yudao-spring-boot-starter-protection 默认禁用 lock4j 依赖,保证启动速度 2 years ago
yudao-spring-boot-starter-redis 1. 移除 netty-all,减少依赖 2 years ago
yudao-spring-boot-starter-security 对齐 boot 与 cloud 的代码 3 years ago
yudao-spring-boot-starter-test 对齐 boot 与 cloud 的代码 3 years ago
yudao-spring-boot-starter-web Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2 years ago
yudao-spring-boot-starter-websocket feat: websocket init 3 years ago
pom.xml 售后日志优化 3 years ago