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

zxl

4 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -43,4 +43,9 @@
    private String userId;


    @TableField("member_coupon_id")
    /** 用户领取优惠卷id
     * */
    private String memberCouponId;

}