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

zxl

6 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

 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;

}