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

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index a59d584..2f5a118 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -1,6 +1,7 @@
 package com.hz.his.dto.coupon;
 
 
+
 import lombok.Data;
 
 import java.util.List;
@@ -17,6 +18,20 @@
     private List<String> couponNumberIdList;
     /**鍟嗗搧淇℃伅*/
     private List<CouponCheckItemDto> goodsList;
+    /**鏄惁鐢熸棩鍒�*/
+    private Integer isBirthday;
+    /**鏄惁绾夸笅鍒�*/
+    private Integer isOffline = 0;
+    /**鎼滅储,绾夸笅浼樻儬鍒哥爜/绾夸笂鍚嶇О*/
+    private String searchData;
+    /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
+    private List<String> payMethodList;
     /**浼樻儬鍒稿钩鍙�*/
     private String platform;
+
+    /** 璁㈠崟鏍囪瘑List */
+    private List<String> orderIdList;
+    /** 璁㈠崟鏍囪瘑 */
+    private String orderId;
+
 }

--
Gitblit v1.8.0