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

chen.lin

2 天以前 c426aa30a98ce85b494de121c92e2a7d01673930

 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: 否  
     */