From 0364a6220c8c21170be09badc6a3645c486ee911 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 16:35:35 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java |    4 ++--
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
index 485fae2..7507994 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java
@@ -42,5 +42,5 @@
     @ApiModelProperty(value = "上次选择车辆品牌")
     private String vehicleBrand;
     @ApiModelProperty(value = "上次选择车辆id")
-    private Long id;
+    private String id;
 }
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index 6d2f30a..3f0099d 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -122,13 +122,13 @@
                 // 没有充电订单 展示最新添加的车辆
                 data.setLicensePlate(cars.get(0).getLicensePlate());
                 data.setVehicleBrand(cars.get(0).getVehicleBrand());
-                data.setId(cars.get(0).getId());
+                data.setId(cars.get(0).getId().toString());
             }else{
                 for (TAppUserCar car : cars) {
                     if (car.getId().equals(data1)){
                         data.setLicensePlate(car.getLicensePlate());
                         data.setVehicleBrand(car.getVehicleBrand());
-                        data.setId(car.getId());
+                        data.setId(car.getId().toString());
                     }
                 }
             }

--
Gitblit v1.7.1