From 4a65361237916166b256934e6ea35932bba7e1c6 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 11 七月 2023 11:26:54 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 5b50ee8..d9e6954 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -4,6 +4,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -18,14 +20,33 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**娲诲姩鏍囪瘑*/
+ private String groupBuyId;
+ private String id;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
private List<UserArrDto> userArr;
-
+ private List<CouponItemDto> itemDtoList;
/**淇敼鏃堕棿*/
private String updateTime;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+ /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /*鐢ㄦ埛浼樻儬鍒�*/
+ private String couponNumberId;
+
+
+
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
}
--
Gitblit v1.8.0