puhui999 f732e7a750 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/api/bargain/BargainRecordApiImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainRecordServiceImpl.java		2023-10-06 00:05:28 +08:00
..
java/cn/iocoder/yudao/module/trade	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-10-06 00:05:28 +08:00
resources/mapper/brokerage	分销：调整推广人列表查询方式	2023-10-02 23:51:49 +08:00