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

peng

4 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

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

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

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

    /**
     * 活动审核记录集合
     */
    private List<ActivityAuditRecordVO> auditRecordVOS;
    /**
     * 审核状态  0 未审核， 1 已审核
     */
    private Integer auditStatus;

    /**
     * 活动申请人id
     */
    private String memberId;

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