From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
index 0cb71c7..8cc8212 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java
@@ -26,7 +26,7 @@
/** 搴楅摵id */
@ApiModelProperty("搴楅摵id")
- private Long storeId;
+ private String storeId;
/** 搴楅摵鍚嶇О */
@ApiModelProperty("搴楅摵鍚嶇О")
@@ -34,7 +34,7 @@
/** 鎶藉娲诲姩id */
@ApiModelProperty("鎶藉娲诲姩id")
- private Long prizeActivityId;
+ private String prizeActivityId;
/** 鎶藉娲诲姩鍚嶇О */
@ApiModelProperty("鎶藉娲诲姩鍚嶇О")
@@ -42,7 +42,7 @@
/** 鐢ㄦ埛id */
@ApiModelProperty("鐢ㄦ埛id")
- private Long userId;
+ private String userId;
/** 鐢ㄦ埛鏄电О */
@ApiModelProperty("鐢ㄦ埛鏄电О")
@@ -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();
--
Gitblit v1.8.0