From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
index d6c461b..ff85e75 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/historySecondCruiser/HistorySecondCruiserResultDTO.java
@@ -23,11 +23,13 @@
     /**
      * ������
      */
+    @JsonProperty(value = "flylat")
     private Double flyLat;
 
     /**
      * ������
      */
+    @JsonProperty(value = "flylon")
     private Double flyLon;
 
     /**

--
Gitblit v1.8.0