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

peng

4 天以前 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

 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;

}