From b185ead5fcf5f87c19df0abe6a32ea2c1b02eb66 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 19 七月 2023 17:02:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-兑换优惠券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..a79a32c 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,9 +1,9 @@
package com.hz.his.dto.coupon;
-
-
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -20,6 +20,8 @@
private String operatorName;
/**鎿嶄綔浜虹被鍨�*/
private Integer operatorType;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
private String id;
@@ -40,6 +42,9 @@
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
-
-
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
}
--
Gitblit v1.8.0