Merge branch 'send_coupon' into user_action

peng

1 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 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")
    /** 奖品内容 */