Merge remote-tracking branch 'origin/master'

doum

10 小时以前 dbddcc6d450759987c0af44ccab8cd5269ae08e8

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java

@@ -34,4 +34,9 @@

    @ApiModelProperty(value = "收支类型 0收入 1支出")
    private Integer dealType;

    @ApiModelProperty(value = "消息参数")
    private String param1;


}