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

peng

7 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 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;

}