From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..dfcebb9 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;
@@ -16,7 +17,7 @@
@NoArgsConstructor
@ApiModel(value = "我的惠民卡详情VO")
public class MyHuiminCardDetailVO {
- @ApiModelProperty("二维码")
+ @ApiModelProperty("二维码生成规则")
private String qrCode;
@ApiModelProperty("惠民卡id")
private Integer cardId;
@@ -27,7 +28,8 @@
private Date endTime;
@ApiModelProperty("绑定人员列表")
private List<TStudent> studentList;
-
+ @ApiModelProperty("惠民卡")
+ private THuiminCard huiminCard;
}
--
Gitblit v1.7.1