From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 46bd05c..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
@@ -1,7 +1,7 @@
package com.hz.his.dto.coupon;
-import com.hz.his.dto.order.OrderPayMethodDto;
+
import lombok.Data;
import java.util.List;
@@ -20,8 +20,23 @@
private List<CouponCheckItemDto> goodsList;
/**鏄惁鐢熸棩鍒�*/
private Integer isBirthday;
- /**鏀粯鏂瑰紡:payMethodNo鏀粯鏂瑰紡缂栧彿 payMethodName鏀粯鏂瑰紡鍚嶇О*/
- private List<OrderPayMethodDto> payMethodDtoList;
- /**浼樻儬鍒稿钩鍙�*/
+ /**鏄惁绾夸笅鍒�*/
+ 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