From 463add4ee035938f9622a6c981668620f097067d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 21 八月 2025 15:29:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeVO.java
index 5e12626..41027e1 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityRefPrizeVO.java
@@ -24,11 +24,11 @@
 
     /** 鎶藉娲诲姩id */
     @ApiModelProperty("鎶藉娲诲姩id")
-    private Long prizeActivityId;
+    private String prizeActivityId;
 
     /** 濂栧搧id */
     @ApiModelProperty("濂栧搧id")
-    private Long prizeId;
+    private String prizeId;
 
     /** 濂栧搧鍐呭 */
     @ApiModelProperty("濂栧搧鍐呭")

--
Gitblit v1.8.0