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

zxl

5 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

 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;

}