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

1

昨天 258f0142619bb02db69c0f7006ca5bcc75d7a2e4

 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;

}