Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-service/src/main/java/com/qs/mp/admin/domain/Coupon.java

@@ -185,5 +185,11 @@ public class Coupon implements Serializable {
     @TableField("updated_time")
     private Date updatedTime;
 
+    /**
+     * 优惠卷详情
+     */
+    @TableField("coupon_detail")
+    private String couponDetail;
+
 
 }

mp-service/src/main/java/com/qs/mp/admin/domain/param/CouponParam.java

@@ -121,4 +121,7 @@ public class CouponParam {
   @ApiModelProperty("是否新用户注册发放:0否,1是")
   private Integer isNewUserCoupon;
 
+  @ApiModelProperty(value = "优惠卷详情", required = false)
+  private String couponDetail;
+
 }