From b249df80d95dd998ee93bcce2a6307b023f8cd0c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 十一月 2023 10:38:26 +0800
Subject: [PATCH] Merge branch 'master' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 7b0dc41..57030f2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 缁撹处閲戦闆嗗悎
  *
@@ -12,12 +14,12 @@
 @Data
 public class PayAmountDto {
     /**蹇呭~ 瀹為檯鏀粯閲戦*/
-    private String amount;
+    private BigDecimal amount;
     /**蹇呭~ 鏀粯鏂瑰紡*/
     private String method;
-    /**蹇呭~ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
-    private String commonId;
 
+    /**闈炲繀濉� 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
+    private String commonId;
     /**闈炲繀濉� 鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶*/
     private String cardEquityId;
     /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶*/

--
Gitblit v1.8.0