From 3a1a818c491e229d9631d7ba6e59a23830204316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E9=BE=99=E7=BC=98?= <794334212@qq.com> Date: Mon, 4 Nov 2024 03:32:51 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=9B=A0=20https://gi?= =?UTF-8?q?tee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053=20PR=20=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=A8=A1=E6=9D=BF=E5=8F=98=E9=87=8F=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AF=BC=E8=87=B4=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8F=91=E8=B4=A7=E5=BF=AB=E9=80=92=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=20=E5=9B=A0=20https://gitee.com/zhijianti?= =?UTF-8?q?anya/ruoyi-vue-pro/pulls/1053=20PR=20=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=98=E9=87=8F=E5=8D=A0=E7=94=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AF=BC=E8=87=B4=20=E8=AE=A2=E5=8D=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8F=91=E8=B4=A7=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 筱龙缘 <794334212@qq.com> --- .../module/trade/service/order/TradeOrderUpdateServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index a9a11c9dc..9ee4cd9ba 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -388,7 +388,7 @@ public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) { // 3. 记录订单日志 TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus(), - MapUtil.builder().put("deliveryName", express != null ? express.getName() : "") + MapUtil.builder().put("expressName", express != null ? express.getName() : "") .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build()); // 4.1 发送站内信 From 2cd7b0d188e6fe9076b0b8fa87d24b5e7d977af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B8=85?= Date: Mon, 11 Nov 2024 12:54:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20system-api=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E9=AA=8C=E8=AF=81=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 jakarta.validation 包名改为 javax.validation，以匹配 Spring Boot 2.7.x 版本要求 影响文件：yudao-module-system-api 模块下的 LoginLogCreateReqDTO 类" --- .../module/system/api/logger/dto/LoginLogCreateReqDTO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java index 7a83c0965..b6a239d2d 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.system.api.logger.dto; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import lombok.Data; @Schema(description = "RPC 服务 - 登录日志创建 Request DTO")