Merge remote-tracking branch 'origin/dev' into dev

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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