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

zxl

5 天以前 88bd75d93f86d3cf4f12e652d459da8bae71e545

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

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


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

}