From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java
index a0332bd..080a9fd 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java
@@ -1,5 +1,6 @@
package com.dsh.activity.model.response;
+import com.dsh.activity.entity.THuiminCard;
import com.dsh.activity.entity.TStudent;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -14,11 +15,11 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
-@ApiModel(value = "我的惠民卡详情VO")
+@ApiModel(value = "我的玩湃惠民卡详情VO")
public class MyHuiminCardDetailVO {
- @ApiModelProperty("二维码")
+ @ApiModelProperty("二维码生成规则")
private String qrCode;
- @ApiModelProperty("惠民卡id")
+ @ApiModelProperty("玩湃惠民卡id")
private Integer cardId;
@ApiModelProperty("富文本内容")
private String introduce;
@@ -27,7 +28,10 @@
private Date endTime;
@ApiModelProperty("绑定人员列表")
private List<TStudent> studentList;
-
+ @ApiModelProperty("玩湃惠民卡")
+ private THuiminCard huiminCard;
+ @ApiModelProperty("购买使用者名称")
+ private String studentName;
}
--
Gitblit v1.7.1