From 2a3cbabe6a25030d5760cc31d5276042f691d62a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 四月 2024 19:55:09 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 17 ++++++++++++++++-
1 files changed, 16 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 e18b413..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
@@ -20,8 +20,23 @@
private List<CouponCheckItemDto> goodsList;
/**鏄惁鐢熸棩鍒�*/
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