From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 a2679de..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,14 +13,16 @@
public class CouponSendUserDto {
/**phis鐢ㄦ埛鏍囪瘑-蹇呭～*/
private String userId;
- /**鏄惁鍙戦��-榛樿鍚�*/
- private Integer isSendSMS;
+ /**鏄惁鍙戦�佺煭淇�0鍚�1鏄�-榛樿鍚�*/
+ private Integer isSendMsg = 0;
- /**娑堣�楀偍鍊奸噾*/
+ /**娑堣�楁�诲偍鍊奸噾*/
private BigDecimal storedValueFund;
- /**娑堣�楀鍊奸噾*/
+ /**娑堣�楁�诲鍊奸噾*/
private BigDecimal valueAddedFund;
- /**娑堣�楃Н鍒�*/
+ /**娑堣�楁�荤Н鍒�*/
private BigDecimal integral;
+ /**鍙戦�佺殑鍒�*/
+ private List<CouponSendItemDto> couponList;
}
--
Gitblit v1.8.0