From c0117519f5e5d63b7a46f574c73118ef98b90990 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 16 八月 2023 18:56:31 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq优惠券分类优化 --- 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 da19c4b..6a6b5c5 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 @@ -32,7 +32,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