From 262d511f52c7530f6f3ddbf595264f9880b4df4f Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期二, 14 十一月 2023 16:26:53 +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/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