Merge remote-tracking branch 'origin/master'

doum

2 天以前 074d1e64936f8af0f51e3a305878ed63a4b96a98

 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;


}