Merge remote-tracking branch 'origin/master'

wu

2024-08-06 4c42d82f177b24f21dee14dd041035fb6c1ce7ee

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java

@@ -47,7 +47,7 @@
    /**
     * 任务类型 1:进   2：出
     */
    private String taskType;
    private Integer taskType;

    /**
     * 宽
@@ -81,7 +81,7 @@
    /**
     * 任务状态 0 未开始  1正在进行   2完成
     */
    private Integer taskStauts;
    private Integer taskStatus;

    /**
     * 创建时间