Merge remote-tracking branch 'origin/master'

doum

昨天 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

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

@@ -35,6 +35,8 @@
    @ApiModelProperty(value = "收支类型 0收入 1支出")
    private Integer dealType;

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


}