From 8639befeaa071a94f86bb2240c7151964b0c0083 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 03 八月 2023 17:46:09 +0800
Subject: [PATCH] Merge branch 'rx-优惠券查询' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 ++++
1 files changed, 4 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 a79a32c..fdb98a9 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;
@@ -47,4 +48,7 @@
private String couponGoodsArr;
/** 璁㈠崟搴斾粯閲戦 */
private BigDecimal shouldTotal;
+
+ /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
+ private Integer isMarketApply = 0;
}
--
Gitblit v1.8.0