YunaiV 20775791d9 Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApi.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/discount/DiscountActivityConvert.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/discount/DiscountProductMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/resources/mapper/discount/DiscountProductMapper.xml # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java		2024-09-15 20:32:58 +08:00
..
yudao-module-product-api	【代码优化】商城: 完成代码评审 TODO	2024-08-20 15:50:07 +08:00
yudao-module-product-biz	Merge remote-tracking branch 'origin/develop' into develop	2024-09-15 20:32:58 +08:00
yudao-module-promotion-api	Merge remote-tracking branch 'origin/develop' into develop	2024-09-15 20:32:58 +08:00
yudao-module-promotion-biz	Merge remote-tracking branch 'origin/develop' into develop	2024-09-15 20:32:58 +08:00
yudao-module-statistics-api	code review：商城统计	2023-10-16 20:01:25 +08:00
yudao-module-statistics-biz	【功能修复】处理统计可能导致的空指针问题	2024-08-21 21:54:12 +08:00
yudao-module-trade-api	【功能优化】商城：拼团中时，禁止发起售后	2024-09-07 14:07:07 +08:00
yudao-module-trade-biz	【代码优化】商城：完善满减送的计算逻辑	2024-09-15 20:27:46 +08:00
pom.xml	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00