From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 10 十月 2023 16:20:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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