Merge remote-tracking branch 'origin/master'

# Conflicts: # yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java
YunaiV · Nov 22, 2024 · b0dbd40 · b0dbd40
2 parents 64cdc5f + cf4cbe2
commit b0dbd40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...rc/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/...rc/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.<String, Object>builder().put("deliveryName", express != null ? express.getName() : "")
+                MapUtil.<String, Object>builder().put("expressName", express != null ? express.getName() : "")
                         .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build());
 
         // 4.1 发送站内信