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

zxl

6 天以前 d9901a1d21c42372d8b38a081844177e578980a6

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

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

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

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