YunaiV cef4c14286 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # 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 22:13:34 +08:00
..
src	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-08-09 22:13:34 +08:00
Dockerfile	Update Dockerfile base image to 8-jre	2023-12-30 11:28:19 +08:00
pom.xml	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2024-08-09 22:13:34 +08:00