From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
index 46045e0..e15d238 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ChargingDto.java
@@ -28,4 +28,8 @@
     private String deviceTemperature;
     //璐圭巼
     private BigDecimal rate;
+    //宸插厖鐢甸噺    0.01KWh
+    private String chargedCapacity;
+    //鍏呯數鏃堕暱
+    private String alreadyChargingTime;
 }

--
Gitblit v1.9.3