From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
index 38bf1e0..1845a2c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java
@@ -34,14 +34,14 @@
     @ApiModelProperty(value = "金额¥")
     private String amountValue;
     @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
+    private Double amount;
     @ApiModelProperty(value = "下单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
     @ApiModelProperty(value = "是否退款 0否1时")
     private Integer isRefund;
     @ApiModelProperty(value = "备注")
-    private Integer remark;
+    private String remark;
 
     /**
      * 支付方式(1=微信,2=支付宝)

--
Gitblit v1.7.1