From cd125a938ef269c4204637625de0b3ba72d931ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 06 六月 2024 12:02:44 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 5863f34..5ecf215 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -59,15 +59,10 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�*/
- private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
- private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
- private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
- private String giveIncreaseTitle;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
- private String giveIncreaseInfo;
+ /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+ private List<String> canIntegralCashIdList;
+
+ /**缁撹处鍚庤禒閫�*/
+ private PaySendDto paySendDto;
}
--
Gitblit v1.8.0