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

zxl

4 天以前 46a66503fdee7f153d6578bfe899431fdad63f8c

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

@@ -24,7 +24,11 @@

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

    @TableField("store_coupon_id")
    /** 店铺优惠卷关联id */
    private String storeCouponId;

    @TableField("coupon_name")
    /** 优惠卷名称 */
@@ -36,7 +40,7 @@

    @TableField("user_id")
    /** 用户id */
    private Long userId;
    private String userId;


}