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

peng

3 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

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

@@ -75,4 +75,7 @@
    @TableField("member_id")
    private String memberId;

    @TableField("store_id")
    private String storeId;

}