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

zjj

5 天以前 25f91c2eb2e458ee065e787bd547f8fe0625e918

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

@@ -53,6 +53,9 @@
    @ApiModelProperty(value= "任务号")
    private String taskCode;

    @ApiModelProperty("任务来源")
    private Short resource;

    /**
     * 任务状态
     */