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

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

@@ -175,5 +175,8 @@ public class CouponVO {
     @ApiModelProperty("更新时间")
     private Date updatedTime;
 
+    @ApiModelProperty(value = "优惠卷详情", required = false)
+    private String couponDetail;
+
 
 }