Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

22 小时以前 c620f4cbc6f5ed50758ea548855773bfed2dcd39

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java

@@ -48,7 +48,8 @@
    MISSION_TEMPLATE_WEIGHING_ONE2("1901", "称重作业中等待上报完成"),



    MISSION_TEMPLATE_NO_EXECUTE1("9998", "1005.不执行任务"),

    MISSION_TRANSFER("9999", "9999.任务完成中"),

    MISSION_TRANSFER("9999", "9999.任务上报中"),

    MISSION_TRANSFER_END("10000", "10000.任务上报完成，等待结束"),

    ;



    public Integer id;