YunaiV ae7323cbe0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-dependencies/pom.xml # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java		2024-08-09 21:52:44 +08:00
..
java/cn/iocoder/yudao/framework	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-08-09 21:52:44 +08:00
resources/META-INF	全局：增加 VO 数据翻译的支持	2024-04-01 12:42:27 +08:00