From ca6dcf17eef4bd6db8e461f332a4596e1831ad15 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 15 六月 2023 14:33:57 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |    4 ++++
 1 files changed, 4 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 e18b413..8390d10 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
@@ -20,6 +20,10 @@
     private List<CouponCheckItemDto> goodsList;
     /**鏄惁鐢熸棩鍒�*/
     private Integer isBirthday;
+    /**鏄惁绾夸笅鍒�*/
+    private Integer isOffline = 0;
+    /**鎼滅储,绾夸笅浼樻儬鍒哥爜/绾夸笂鍚嶇О*/
+    private String searchData;
     /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
     private List<String> payMethodList;
     /**浼樻儬鍒稿钩鍙�*/

--
Gitblit v1.8.0