From 09cf27cc000267a7d23e3cf5d78ef690e603bdf3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:49:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/UploadRealTimeMonitoringDataMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/UploadRealTimeMonitoringDataMessage.java
index 8a8f765..dd1c034 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/UploadRealTimeMonitoringDataMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/UploadRealTimeMonitoringDataMessage.java
@@ -22,10 +22,10 @@
     private Integer insertion_status; // 是否插枪(0:否,1:是)
     private BigDecimal output_voltage; // 输出电压,精确到小数点后一位;待机置零
     private BigDecimal output_current; // 输出电流,精确到小数点后一位;待机置零
-    private Integer gun_line_temperature; // 枪线温度,整形,偏移量-50;待机置零
+    private BigDecimal gun_line_temperature; // 枪线温度,整形,偏移量-50;待机置零
     private String gun_line_code; // 枪线编码,没有置零
     private Integer soc; // SOC待机置零;交流桩置零
-    private Integer battery_temperature; // 电池组最高温度,整形,偏移量-50 ºC;待机置零;交流桩置零
+    private BigDecimal battery_temperature; // 电池组最高温度,整形,偏移量-50 ºC;待机置零;交流桩置零
     private Integer cumulative_charging_time; // 累计充电时间,单位:min;待机置零
     private Integer time_remaining; // 剩余时间,单位:min;待机置零、交流桩置零
     private BigDecimal charging_degree; // 充电度数,精确到小数点后四位;待机置零

--
Gitblit v1.7.1