Merge remote-tracking branch 'origin/master'

doum

23 小时以前 04aa86aaad90ac02a4d167129ab3e530e9a9589c

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

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

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



}