Merge remote-tracking branch 'origin/send_coupon' into user_action

peng

5 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeDraw.java

@@ -28,7 +28,7 @@

    @TableField("coupon_id")
    /** 优惠卷id */
    private Long couponId;
    private String couponId;

    @TableField("prize_content")
    /** 奖品内容 */