From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/model/CouponListVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/CouponListVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/CouponListVo.java
index 882772a..4e4aaea 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/CouponListVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/CouponListVo.java
@@ -12,7 +12,7 @@
 @ApiModel
 public class CouponListVo {
     @ApiModelProperty("优惠券id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty("优惠券名称")
     private String name;
     @ApiModelProperty("优惠券类型(1=满减券,2=代金券,3=体验券)")

--
Gitblit v1.7.1