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

peng

昨天 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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

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

    private String prizeActivityCoverUrl;

    private String prizeImgUrl;

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

    public static PrizeRecordVO getVoByEntity(@NonNull PrizeRecord entity, PrizeRecordVO vo) {
        if(vo == null) {
            vo = new PrizeRecordVO();