From 6d2385e7e53d0d48f6d4c484042c29e977f4ab01 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期三, 15 十一月 2023 19:04:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java index e18ddd8..d2c7327 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java @@ -11,8 +11,17 @@ /**浼樻儬鍒告爣璇�*/ private String couponId; - - /**鏍囪瘑鐖舵爣璇嗗瓧绗︿覆閫楀彿鍒嗛殧*/ + /**鏁伴噺*/ private Integer num; + //澶氫紭鎯犲埜鍙戞斁鏃朵娇鐢ㄥ瓧娈� + /**鎵规鍙峰悕绉�*/ + private String recordName; + /**鍏叡鏍囪瘑*/ + private String commonId; + /**鍏叡瀛愭爣璇�*/ + private String commonItemId; + /**鍏叡绫诲瀷(CouponRecordDto)*/ + private String commonType; + } -- Gitblit v1.8.0