From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
index 5d4edad..6a040f6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java
@@ -3,6 +3,7 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -15,8 +16,14 @@
     private String title;
     /**鐢宠绫诲瀷**/
     private Integer type;
+    /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=鎸囧畾 1=閫氱敤 **/
+    private Integer useProjectType;
     /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/
     private List<Map<String,Object>> serviceIds;
     /**闂ㄥ簵ID*/
     private String shopId;
+    /**绱鐢宠鏁伴噺*/
+    private Integer applyNum;
+    /**绱鐢宠閲戦*/
+    private BigDecimal applyAmount;
 }

--
Gitblit v1.8.0