From 98fb96938258c6b966e007259860c9cdc8d5e2f2 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |   10 +++++++++-
 1 files changed, 9 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..63b570e 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,18 @@
     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;
+    /** 鏍囧織鏍囪瘑 */
+    private String commonId;
+
 }

--
Gitblit v1.8.0