From 96a3439306a4e7e3743f0d1c4b6253690f7fdf6c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 06 七月 2023 12:19:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |    7 +++++++
 1 files changed, 7 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 a751cd0..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;
 
 /**
@@ -42,4 +44,9 @@
 
 
 
+    //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+    /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+    private String couponGoodsArr;
+    /** 璁㈠崟搴斾粯閲戦 */
+    private BigDecimal shouldTotal;
 }

--
Gitblit v1.8.0