Merge remote-tracking branch 'origin/master'

doum

昨天 a76e2318dd2731ff713df6e262396a9175d029f7

 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;


}