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

zxl

4 天以前 88bd75d93f86d3cf4f12e652d459da8bae71e545

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java

@@ -90,6 +90,12 @@
    private Boolean isReport;

    /**
     * 是否发布
     */
    private Boolean publish;


    /**
     * 是否收藏
     */
    private Boolean isCollect;