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

zhou zhou

19 小时以前 10776dd6f7f9ef9e47419427fcb1b692ed73d54d

 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;

}