From c0ceef9f86c0abb288ade6a7770c02326848f8a4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 13:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java
index 1416c44..7057e39 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java
@@ -17,7 +17,7 @@
public class PageChargingOrderAndUploadRealTimeMonitoringDataDto extends BaseModel {
private List<ChargingOrderAndUploadRealTimeMonitoringDataDto> records;
- private Long count;
+ private Long total;
}
--
Gitblit v1.7.1