From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
index 81399d7..8486810 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
@@ -13,12 +13,16 @@
public class CouponSendUserDto {
/**phis鐢ㄦ埛鏍囪瘑-蹇呭～*/
private String userId;
+ /**鏄惁鍙戦�佺煭淇�0鍚�1鏄�-榛樿鍚�*/
+ private Integer isSendMsg = 0;
- /**娑堣�楀偍鍊奸噾*/
+ /**娑堣�楁�诲偍鍊奸噾*/
private BigDecimal storedValueFund;
- /**娑堣�楀鍊奸噾*/
+ /**娑堣�楁�诲鍊奸噾*/
private BigDecimal valueAddedFund;
- /**娑堣�楃Н鍒�*/
+ /**娑堣�楁�荤Н鍒�*/
private BigDecimal integral;
+ /**鍙戦�佺殑鍒�*/
+ private List<CouponSendItemDto> couponList;
}
--
Gitblit v1.8.0