Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-29 e89e19c317ca1b0b4caee20c8d1c172196006624

 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);