From 0a33a559bfea025d874786c0c554a9656669a274 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 14 六月 2024 14:55:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java index 4d0edb9..1cb4370 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java @@ -23,14 +23,14 @@ /**澧炲�奸噾璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/ private String incrementInfo; -// /**绉垎*/ -// private BigDecimal integralMoney = BigDecimal.ZERO; -// /**绉垎璧犻�佸埌璐﹁鍒欙紙MoneyRule锛�*/ -// private String integralRuleId; -// /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/ -// private String integralTitle; -// /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/ -// private String integralInfo; + /**绉垎*/ + private BigDecimal integralMoney = BigDecimal.ZERO; + /**绉垎璧犻�佸埌璐﹁鍒欙紙MoneyRule锛�*/ + private String integralRuleId; + /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/ + private String integralTitle; + /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/ + private String integralInfo; /**浼樻儬鍒�*/ private List<PaySendItemDto> couponList; -- Gitblit v1.8.0