From 487ebcc3b2db366ad7bfb6f34bd11f4ffec9e11e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 20:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
index 6f3527e..8dfad3e 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -341,7 +341,7 @@
             res.put("name", "测试.png");
             return res.toJSONString();
         } catch (Exception e) {
-            log.error("广告物料整体项目结算表导入图片上传oss异常", e);
+            log.error("在库车辆导入图片上传oss异常", e);
         }
         return null;
     }

--
Gitblit v1.7.1