Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 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;

}