YunaiV 2876c7ce16 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp ... # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java		2024-09-15 11:24:32 +08:00
..
yudao-module-product-api	【代码优化】商城: 完成代码评审 TODO	2024-08-20 15:50:07 +08:00
yudao-module-product-biz	【功能】完成商品列表价格计算时，需要支持减免金额的功能	2024-09-14 19:01:57 +08:00
yudao-module-promotion-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp	2024-09-15 11:24:32 +08:00
yudao-module-promotion-biz	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp	2024-09-15 11:24:32 +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	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp	2024-09-15 11:24:32 +08:00
pom.xml	商城：增加 stat 统计设计	2023-09-27 19:14:32 +08:00