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

lbq

4 天以前 912b4dab5f847ab1108b18df1b5e06e85c71881e

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java

@@ -154,6 +154,9 @@
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    private Integer status;

    @ApiModelProperty(value = "任务来源，mes、erp")
    private String taskOrigin;

    /**
     * 是否删除 1: 是  0: 否  
     */