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 | 8 +++++++- 1 files changed, 7 insertions(+), 1 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 7c6dfbb..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 @@ -2,6 +2,7 @@ import com.hz.his.dto.PageDto; import lombok.Data; +import org.dom4j.tree.BaseElement; import java.math.BigDecimal; import java.util.List; @@ -49,5 +50,10 @@ private BigDecimal shouldTotal; /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/ - private Integer isMarketApply; + private Integer isMarketApply = 0; + + /** 浼樻儬鍒稿垎绫籌D*/ + private String couponTypeId; + /** 鍩虹鍒嗙被-浼樻儬鍒�*/ + private String type; } -- Gitblit v1.8.0