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/common/utils/DateUtil.kt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt b/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
index 62d5219..0e26e93 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt
@@ -230,7 +230,7 @@
* @param date 鏃ユ湡瀛楃涓�
* @return 鏃ユ湡
*/
- fun StringToDate(date: String): Date? {
+ fun StringToDate(date: String?): Date? {
val dateStyle = getDateStyle(date)
return StringToDate(date, dateStyle)
}
@@ -726,6 +726,7 @@
YYYY_MM_DD_HH("yyyyMMddHH", false),
YYYY_MM_DD_HH_MM("yyyy-MM-dd HH:mm", false),
YYYY_MM_DD_HH_MM_SS("yyyy-MM-dd HH:mm:ss", false),
+ YYYY_MM_DD_HH_MM_SS_M("yyyy-MM-dd HH:mm:ss.sss", false),
YYYY_MM_EN("yyyy/MM", false),
YYYY_MM_DD_EN("yyyy/MM/dd", false),
--
Gitblit v1.9.3