From ca6dcf17eef4bd6db8e461f332a4596e1831ad15 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 15 六月 2023 14:33:57 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 38bf6c7..3eab1ff 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
@@ -1,15 +1,48 @@
package com.hz.his.dto.coupon;
+
+
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
* @author fwq
- * 浼樻儬鍒告墿灞�
- * */
+ */
@Data
public class CouponDto extends PageDto {
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**娲诲姩鏍囪瘑*/
+ 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