puhui999 52848d6341 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java		2023-09-20 10:14:43 +08:00
..
src	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-09-20 10:14:43 +08:00
pom.xml	砍价活动: 完善 app 端获取活动分页、列表、详情接口	2023-09-19 16:35:21 +08:00