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

zxl

5 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

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

@@ -68,6 +68,14 @@
    @TableField("activity_content")
    private String activityContent;

    /**  判断是否发布*/
    @TableField("publish")
    private Boolean publish;

    @TableField("member_id")
    private String memberId;

    @TableField("store_id")
    private String storeId;

}