Merge remote-tracking branch 'origin/master'

rk

21 小时以前 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

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

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

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



}