From 2f658526cbfcfc951f6585dd43b4f0e5d16a9ce0 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 18:56:41 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 4 ++--
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
index 39f91e7..ede1550 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -34,7 +34,7 @@
/**鏉ユ簮瀛愭爣璇�*/
private String commonItemId;
- /**鍙戦�佺殑鍒镐俊鎭�-蹇呭～*/
- private List<CouponSendItemDto> couponList;
+ /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
+ private List<CouponSendUserDto> sendUserList;
}
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 ff0443e..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
@@ -16,11 +16,13 @@
/**鏄惁鍙戦�佺煭淇�0鍚�1鏄�-榛樿鍚�*/
private Integer isSendMsg = 0;
- /**娑堣�楀偍鍊奸噾*/
+ /**娑堣�楁�诲偍鍊奸噾*/
private BigDecimal storedValueFund;
- /**娑堣�楀鍊奸噾*/
+ /**娑堣�楁�诲鍊奸噾*/
private BigDecimal valueAddedFund;
- /**娑堣�楃Н鍒�*/
+ /**娑堣�楁�荤Н鍒�*/
private BigDecimal integral;
+ /**鍙戦�佺殑鍒�*/
+ private List<CouponSendItemDto> couponList;
}
--
Gitblit v1.8.0