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

zxl

8 天以前 3fdceb6011f62d5d2a9d26f5f840f75055506226

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

@@ -72,4 +72,10 @@
    @TableField("publish")
    private Boolean publish;

    @TableField("member_id")
    private String memberId;

    @TableField("store_id")
    private String storeId;

}