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/ScanPrizeVO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
index 461ca24..41d6157 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java
@@ -22,15 +22,15 @@
/** 搴楅摵id */
@ApiModelProperty("搴楅摵id")
- private Long storeId;
+ private String storeId;
/** 搴楅摵鍚嶇О */
@ApiModelProperty("搴楅摵鍚嶇О")
- private Long storeName;
+ private String storeName;
/** 鎶藉娲诲姩id */
@ApiModelProperty("鎶藉娲诲姩id")
- private Long prizeActivityId;
+ private String prizeActivityId;
/** 鎶藉娲诲姩鍚嶇О鍚嶇О */
@ApiModelProperty("鎶藉娲诲姩鍚嶇О鍚嶇О")
@@ -52,6 +52,7 @@
@ApiModelProperty("鏄惁鍚敤")
private String status;
+
public static ScanPrizeVO getVoByEntity(@NonNull ScanPrize entity, ScanPrizeVO vo) {
if(vo == null) {
vo = new ScanPrizeVO();
--
Gitblit v1.8.0