owen f7296d18b9 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java		2023-09-24 10:10:53 +08:00
..
yudao-module-member-api	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate	2023-09-24 10:10:53 +08:00
yudao-module-member-biz	Merge remote-tracking branch 'origin/feature/mall_product' into brokerate	2023-09-24 10:10:53 +08:00
pom.xml	1. 【修复】单元测试报错	2022-04-22 00:07:54 +08:00