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

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

 screen-manage/src/main/java/com/moral/api/pojo/dto/cruiser/CruiserDTO.java

@@ -28,6 +28,9 @@
    private Double flyLon;


    private String data;



    @Override
    public boolean equals(Object o) {