jason ebd4ea548c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java		2023-09-14 16:59:05 +08:00
..
yudao-module-product-api	code review：订单部分逻辑	2023-09-12 13:54:52 +08:00
yudao-module-product-biz	spu：分佣属性和分佣保持一致	2023-09-09 23:18:09 +08:00
yudao-module-promotion-api	code review：订单部分逻辑	2023-09-12 13:54:52 +08:00
yudao-module-promotion-biz	Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product	2023-09-14 16:59:05 +08:00
yudao-module-trade-api	code review：调整操作日志的封装	2023-09-13 23:25:52 +08:00
yudao-module-trade-biz	code review：调整操作日志的封装	2023-09-13 23:25:52 +08:00
pom.xml	适配 mall 模块的 openapi	2023-02-04 13:06:54 +08:00