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

zxl

5 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -64,6 +64,10 @@
    @ApiModelProperty("活动奖品关联表id")
    private Long activityPrizeRefId;

    private String prizeActivityCoverUrl;

    private String prizeImgUrl;

    /** 奖品发放状态 */
    private String distributeStatus;