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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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

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


    private String data;


    private String state;


    public CruiserDTO() {
        this.state = "1"; // 设置state字段默认值为1
    }

    @Override
    public boolean equals(Object o) {