From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 b3ea858..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,6 +20,8 @@
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
private String id;
@@ -38,4 +42,11 @@
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
+
+
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
}
--
Gitblit v1.8.0