From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |   22 +++++++++++++++++++++-
 1 files changed, 21 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 a59d584..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,6 +1,7 @@
 package com.hz.his.dto.coupon;
 
 
+
 import lombok.Data;
 
 import java.util.List;
@@ -17,6 +18,25 @@
     private List<String> couponNumberIdList;
     /**鍟嗗搧淇℃伅*/
     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