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

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

@@ -139,4 +139,10 @@ public class TicketAwardsPrize implements Serializable {
     @TableField(exist = false)
     private Integer cost;
 
+    /**
+     * 优惠卷详情
+     */
+    @ApiModelProperty("优惠卷详情")
+    @TableField("coupon_detail")
+    private String couponDetail;
 }

mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -66,6 +66,8 @@
                 when 'goods' then if(t2.cost is not null, t2.cost, 0)
                 else 0
             end as cost,
+
+            if(t3.coupon_detail is not null, t3.coupon_detail, '') as coupon_detail,
             t1.*
         from mp_ticket_awards_prize t1
             left join mp_goods t2 on t1.ref_id = t2.goods_id