From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java
new file mode 100644
index 0000000..3ea7c5d
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java
@@ -0,0 +1,55 @@
+package com.moral.api.pojo.dto.cruiser;
+
+
+import lombok.Data;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class CruiserDTO {
+
+    /**
+     * ������������
+     */
+    private String time;
+
+    /**
+     * ������
+     */
+    @JsonProperty(value = "flylat")
+    private Double flyLat;
+
+    /**
+     * ������
+     */
+    @JsonProperty(value = "flylon")
+    private Double flyLon;
+
+
+    private String data;
+
+
+    private String state;
+
+
+    public CruiserDTO() {
+        this.state = "1"; // ������state������������������1
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CruiserDTO cruiser = (CruiserDTO) o;
+        //���type���color ������������������������������������true
+        return Objects.equals(flyLat, cruiser.flyLat) &&
+                Objects.equals(flyLon, cruiser.flyLon);
+    }
+    @Override
+    public int hashCode() {
+        return Objects.hash(flyLat, flyLon);
+    }
+
+}

--
Gitblit v1.8.0