From c6b57d91ab6d54f6f46ace728baf80a4ac49fad3 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 15:54:45 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
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