From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期五, 12 七月 2024 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 99d66e4..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,14 +59,10 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�*/
- private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
- private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
- private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず锛�*/
- private String giveIncreaseTitle;
+ /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+ private List<String> canIntegralCashIdList;
+ /**缁撹处鍚庤禒閫�*/
+ private PaySendDto paySendDto;
}
--
Gitblit v1.8.0