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

chen.lin

昨天 a488088a18a9b8808bc57124681cee8c4ada7299

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskReportParam.java

@@ -37,4 +37,7 @@
    @ApiModelProperty("消息数据")
    private String data;

    @ApiModelProperty("类别")
    private Integer type = 0;

}