From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 4 +++-
1 files changed, 3 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 249de13..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
@@ -26,13 +26,15 @@
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