From f34551ff1b056a39b2581581a3de7931ceb88d2a Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期二, 29 八月 2023 14:29:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 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 015c101..260182b 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,10 @@ package com.hz.his.dto.coupon; - - import com.hz.his.dto.PageDto; import lombok.Data; +import org.dom4j.tree.BaseElement; + +import java.math.BigDecimal; import java.util.List; /** @@ -18,6 +19,10 @@ private String operatorId; /**鎿嶄綔浜哄悕绉�*/ private String operatorName; + /**鎿嶄綔浜虹被鍨�*/ + private Integer operatorType; + /**鐢ㄦ埛鏍囪瘑*/ + private String userId; /**娲诲姩鏍囪瘑*/ private String groupBuyId; private String id; @@ -33,5 +38,22 @@ /**浼樻儬鍒告爣璇�*/ private String couponId; + /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/ + private String orderId; + /*鐢ㄦ埛浼樻儬鍒�*/ + private String couponNumberId; + //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟 + /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */ + private String couponGoodsArr; + /** 璁㈠崟搴斾粯閲戦 */ + private BigDecimal shouldTotal; + + /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/ + private Integer isMarketApply = 0; + + /** 浼樻儬鍒稿垎绫籌D*/ + private String couponTypeId; + /** 鍩虹鍒嗙被-浼樻儬鍒�*/ + private String type; } -- Gitblit v1.8.0