From 1cc34b1ca79017139b79756dcd6247eb47fc41b6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 21 十一月 2023 15:48:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 68d583e..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
@@ -22,10 +22,16 @@
     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