puhui999 b697ee3298 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java		2023-07-05 22:08:12 +08:00
..
yudao-module-product-api	fix：mall promotion Combination	2023-07-05 11:31:16 +08:00
yudao-module-product-biz	fix：mall promotion Combination	2023-07-05 11:31:16 +08:00
yudao-module-promotion-api	fix：mall promotion Combination	2023-07-05 11:31:16 +08:00
yudao-module-promotion-biz	fix：mall promotion SeckillActivity	2023-07-05 22:05:05 +08:00
yudao-module-trade-api	mall + trade：	2023-07-02 12:55:15 +08:00
yudao-module-trade-biz	mall + pay：	2023-07-04 23:43:16 +08:00
pom.xml	适配 mall 模块的 openapi	2023-02-04 13:06:54 +08:00