From af4c5c9913304e4ef0903686ebf4b823525a3ba9 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 21 七月 2023 11:08:13 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
/dev/null | 15 ---------------
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 1 +
2 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 2f57aab..a79a32c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -24,6 +24,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
+ private String id;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java
deleted file mode 100644
index 1a96094..0000000
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hz.his.vo.user.card;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**鐢ㄦ埛鍗￠」淇℃伅
- * @author CJH*/
-@Data
-public class UserCardMapVo {
-
- /**鍗″寘鏁扮粍*/
- private List<UserCardVo> userCardList;
-
-}
--
Gitblit v1.8.0