From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 17 一月 2025 16:15:43 +0800
Subject: [PATCH] 1. 修改融合数据逻辑中，融合数据id数组为先排序后转换为字符串，修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题；
---
src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricVo.kt | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricVo.kt b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricVo.kt
index 856bf3c..8142d42 100644
--- a/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricVo.kt
+++ b/src/main/kotlin/com/flightfeather/uav/lightshare/bean/ElectricVo.kt
@@ -6,12 +6,14 @@
var d1eA: Double = .0,
var d1eB: Double = .0,
var d1eC: Double = .0,
+ var d1Avg: Double = .0,
var d1Status: String? = "0",
- var d1StatusName: String? = null,
+ var d1StatusName: String? = "寰呮満",
//搴熸皵鍑�鍖栬缃�
var d2eA: Double = .0,
var d2eB: Double = .0,
var d2eC: Double = .0,
+ var d2Avg: Double = .0,
var d2Status: String? = "0",
- var d2StatusName: String? = null
+ var d2StatusName: String? = "寰呮満"
)
\ No newline at end of file
--
Gitblit v1.9.3