Merge remote-tracking branch 'origin/master'

doum

16 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

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

@@ -38,5 +38,8 @@
    @ApiModelProperty(value = "消息参数")
    private String param1;

    @ApiModelProperty(value = "备注")
    private String remark;


}