From 1b6aaa7d6c379ccdb0870a36f848c1f811577bf0 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 24 四月 2024 17:24:20 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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..4c0a590 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,21 @@
     private Integer isBirthday;
     /**鏄惁绾夸笅鍒�*/
     private Integer isOffline = 0;
-    /**浼樻儬鍒哥爜*/
+    /**鎼滅储,绾夸笅浼樻儬鍒哥爜/绾夸笂鍚嶇О*/
     private String searchData;
     /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
     private List<String> payMethodList;
-    /**浼樻儬鍒稿钩鍙�*/
+    /**浼樻儬鍒稿钩鍙�:crm;p-his*/
     private String platform;
+
+    /** 璁㈠崟鏍囪瘑List */
+    private List<String> orderIdList;
+    /** 璁㈠崟鏍囪瘑 */
+    private String orderId;
+    /** 鏍囧織鏍囪瘑 */
+    private String commonId;
+
+    /**瑕佺粨璐︽搷浣滃钩鍙癆PPID*/
+    private String appId;
+
 }

--
Gitblit v1.8.0