From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteDataMix.kt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteDataMix.kt b/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteDataMix.kt
index 8f4c3c9..92fffae 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteDataMix.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/satellite/SatelliteDataMix.kt
@@ -50,7 +50,7 @@
groupId = firstGridData?.groupId
dataTime = Date()
type = SatelliteDataType.Mix.value.toByte()
- mixDataId = dataIdList.joinToString(",")
+ mixDataId = dataIdList.sorted().joinToString(",")
}
gridDataMapper.insert(avgGridData)
--
Gitblit v1.9.3