From bd97f8c5cd9be78abfaaab295319bd7ceef98f11 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 11 十月 2024 14:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
index be2a555..c190e8a 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/BmsDemandAndChargerExportation.java
@@ -26,10 +26,10 @@
     private BigDecimal bms_current_measurement_value; // BMS 充电电流测量值
     private Integer bms_battery_voltage_and_group_number; // BMS 最高单体动力蓄电池电压及组号(1-12 位:最高单体动力蓄电池电压,数据分辨率:0.01 V/位,0 V 偏移量;数据范围:0~24 V;13-16 位:最高单体动力蓄电池电压所在组号,数据分辨率:1/位,0 偏移量;数据范围:0~15)
     private BigDecimal bms_charged_status; // BMS 当前荷电状态 SOC( %)
-    private Integer bms_remaining_charging_time; // BMS 估算剩余充电时间
+    private BigDecimal bms_remaining_charging_time; // BMS 估算剩余充电时间
     private BigDecimal voltage_output_value; // 电桩电压输出值
     private BigDecimal current_output_value; // 电桩电流输出值
-    private Integer cumulative_charging_time; // 累计充电时间
+    private BigDecimal cumulative_charging_time; // 累计充电时间
 
 
 }

--
Gitblit v1.7.1