From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
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 d11a972..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());
}
}
}
@@ -164,6 +164,7 @@
public R<List<TAppUserCar>> carList() {
List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId()));
+ appUserId.forEach(s->s.setId_(s.getId().toString()));
return R.ok(appUserId);
}
--
Gitblit v1.7.1