Merge remote-tracking branch 'origin/master'

doum

昨天 11e35e0257e48667292b4f563ddf6ce02a3a22bb

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java

@@ -120,6 +120,7 @@
    private String applyIds;

    @ApiModelProperty(value = "折扣卷满减上限金额")
    @TableField(fill = FieldFill.UPDATE)
    private BigDecimal maxPrice;