YunaiV e163bdf634 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeSeckillActivityPriceCalculator.java		2024-10-07 15:57:56 +08:00
..
src/main/java/cn/iocoder/yudao/module/promotion	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-10-07 15:57:56 +08:00
pom.xml	promotion：去除已经不使用的代码	2023-10-23 19:24:04 +08:00