Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 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;

    /**