Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-12 a5771725ac324c3dae366e6fcc38055b39ea4386

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTask.java

@@ -31,6 +31,10 @@
    /**
     * 任务状态 0默认空任务 1执行中 2结束任务
     */
    private Integer inkageState;
    /**
     * 任务状态 0默认空任务 1执行中 2结束任务
     */
    private Integer taskState;
    /**
     * 创建时间