From ad79642adf7d56b1c54898ce971a976683a88dd3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 10 十月 2024 11:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
index db7af90..4adcfb7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
@@ -18,7 +18,7 @@
     @ApiModelProperty(value = "支付方手机号")
     private String phone;
     @ApiModelProperty(value = "支付金额")
-    private BigDecimal money;
+    private String money;
     @ApiModelProperty(value = "支付方式")
     private String payType;
     @ApiModelProperty(value = "流水项目")

--
Gitblit v1.7.1