From 0f659a76f48dcccd67c0560be28da8c183f53376 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期日, 25 六月 2023 10:18:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new'

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 46bd05c..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
@@ -1,7 +1,7 @@
 package com.hz.his.dto.coupon;
 
 
-import com.hz.his.dto.order.OrderPayMethodDto;
+
 import lombok.Data;
 
 import java.util.List;
@@ -20,8 +20,12 @@
     private List<CouponCheckItemDto> goodsList;
     /**鏄惁鐢熸棩鍒�*/
     private Integer isBirthday;
-    /**鏀粯鏂瑰紡:payMethodNo鏀粯鏂瑰紡缂栧彿 payMethodName鏀粯鏂瑰紡鍚嶇О*/
-    private List<OrderPayMethodDto> payMethodDtoList;
+    /**鏄惁绾夸笅鍒�*/
+    private Integer isOffline = 0;
+    /**鎼滅储,绾夸笅浼樻儬鍒哥爜/绾夸笂鍚嶇О*/
+    private String searchData;
+    /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
+    private List<String> payMethodList;
     /**浼樻儬鍒稿钩鍙�*/
     private String platform;
 }

--
Gitblit v1.8.0