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 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java # yudao-ui-admin/src/views/mall/trade/order/index.vue		3 years ago
..
yudao-module-product-api	product：完善 App 商品详情接口	3 years ago
yudao-module-product-biz	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp	3 years ago
yudao-module-promotion-api	秒杀时段新增修改时间段冲突校验。	3 years ago
yudao-module-promotion-biz	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp	3 years ago
yudao-module-trade-api	trade：完成管理后台的订单详情的简单对接	3 years ago
yudao-module-trade-biz	trade：增加用户 App 的订单分页和详情接口	3 years ago
pom.xml	将 market 模块，调整成 promotion 模块	3 years ago