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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

 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;

    /**