Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java

@@ -70,7 +70,6 @@
                .page(Page.of(query.getPageCurr(), query.getPageSize()));

        for (TParkingRecord record : page.getRecords()) {
            record.setName(parkingLotService.getById(record.getParkingLotId()).getName());
            record.setUid(record.getId().toString());
        }
        return R.ok(page);