From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 14:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java
index 96263ef..d96bea5 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryDateVO.java
@@ -3,10 +3,7 @@
import com.moral.util.DateUtils;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
/**
* @ClassName UAVQueryDateVO
@@ -25,7 +22,7 @@
* @Author: ���������
* @Date: 2021/9/8
*/
- public HashSet<String> datesStr;
+ public Set<String> datesStr;
/**
* @Description: ���������������������������������vo���������
@@ -37,7 +34,7 @@
public static UAVQueryDateVO convert(List<Date> dates){
//������������������������������������
UAVQueryDateVO uavQueryDateVO = new UAVQueryDateVO();
- HashSet<String> datesStr = new HashSet<>();
+ Set<String> datesStr = new LinkedHashSet<>();
for (Date date : dates) {
datesStr.add(DateUtils.dateToDateString(date,"yyyy-MM-dd"));
}
--
Gitblit v1.8.0