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-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index f3ece3c..1a3c63c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -51,6 +51,7 @@
 		parkingRecord.setCode(code);
 		parkingRecord.setVehicleColor(order.getPlateColor());
 		TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
+		parkingRecord.setName(data.getName());
 		parkingRecord.setParkingLotId(data.getId());
 		parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		parkingRecord.setStatus(1);
@@ -101,6 +102,7 @@
 		parkingRecord.setCode(code);
 		parkingRecord.setVehicleColor(order.getPlatecolor());
 		TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
+		parkingRecord.setName(data.getName());
 		parkingRecord.setParkingLotId(data.getId());
 		parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		parkingRecord.setStatus(1);

--
Gitblit v1.7.1