puhui999 8b480c52cc 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/dal/mysql/combination/CombinationRecordMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java		2023-10-06 21:15:06 +08:00
..
yudao-module-product-api	code review：积分、优惠劵、佣金等逻辑	2023-10-01 23:31:07 +08:00
yudao-module-product-biz	code review：积分、优惠劵、佣金等逻辑	2023-10-01 23:31:07 +08:00
yudao-module-promotion-api	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-10-06 00:05:28 +08:00
yudao-module-promotion-biz	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-10-06 21:15:06 +08:00
yudao-module-statistics-api	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00
yudao-module-statistics-biz	stat：增加用户统计的设计	2023-10-04 18:53:49 +08:00
yudao-module-trade-api	!653 完善拼团活动下单流程	2023-10-06 02:20:21 +00:00
yudao-module-trade-biz	trade：调整拼团活动列表接口	2023-10-06 21:04:37 +08:00
pom.xml	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00