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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

@@ -52,6 +52,8 @@
    @ApiModelProperty("领取状态")
    private String claimStatus;

    private String material;

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