Merge remote-tracking branch 'origin/master'

rk

18 小时以前 4d2dda710968035fa52e69dea47525985674422b

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

@@ -34,4 +34,7 @@

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



}