From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
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