From 0961a8595a8b8a3db70b7dd0608d630637458bee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 20:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
index 162990b..75e2841 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
@@ -68,7 +68,7 @@
 	 * 快递100查询带有地图轨迹数据的快递详情
 	 * @param com   快递公司代码
 	 * @param num   快递单号
-	 * @param from  触发城市名称
+	 * @param from  出发城市名称
 	 * @param to    到达城市名称
 	 * @return
 	 */

--
Gitblit v1.7.1