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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java

@@ -42,7 +42,7 @@
    private String  time;


    public SecondCruiserSort() {
        this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd 00:00:00"); // 构造函数中设置默认值
    }
/*    public SecondCruiserSort() {
        this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd HH:00:00"); // 构造函数中设置默认值
    }*/
}