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

lbq

5 天以前 912b4dab5f847ab1108b18df1b5e06e85c71881e

 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;