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

peng

8 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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

@@ -94,6 +94,19 @@
     */
    private Boolean publish;

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

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

    /**
     * 是否收藏