Merge remote-tracking branch 'origin/tzmsewcs' into tzmsewcs

zhang

2025-06-13 ae54e42cbe354ef5c39954eed2eab18de9504946

 src/main/java/com/zy/core/model/command/CrnCommand.java

@@ -90,16 +90,6 @@
    //指令ID
    private Integer commandId;

    public void setTaskMode(Short taskMode){
        this.taskMode = taskMode;
        this.taskModeType = CrnTaskModeType.get(taskModeType);
    }

    public void setTaskMode(CrnTaskModeType type) {
        this.taskModeType = type;
        this.taskMode = CrnTaskModeType.get(type).id.shortValue();
    }

    public static void main(String[] args) {
        Date date = new Date();
        Calendar cal = Calendar.getInstance();
@@ -122,4 +112,14 @@
        System.out.println("礼拜");
        System.out.println(mm);
    }

    public void setTaskMode(Short taskMode) {
        this.taskMode = taskMode;
        this.taskModeType = CrnTaskModeType.get(taskModeType);
    }

    public void setTaskMode(CrnTaskModeType type) {
        this.taskModeType = type;
        this.taskMode = CrnTaskModeType.get(type).id.shortValue();
    }
}