From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java
index c003f6a..ad44d1c 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java
@@ -1,8 +1,10 @@
 package com.ruoyi.user.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -12,6 +14,9 @@
  */
 @Data
 public class WithdrawOrderVO {
+
+    @ApiModelProperty("订单id")
+    private String orderId;
 
     @ApiModelProperty("订单编号")
     private String orderNumber;
@@ -27,11 +32,19 @@
 
     @ApiModelProperty("封面图片")
     private String cover;
+    @ApiModelProperty("地址")
+    private String address;
 
     @ApiModelProperty("订单完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
     @ApiModelProperty("是否已提现(0:未提现,1:已提现)")
     private Integer isWithdrawal;
 
+    @ApiModelProperty("订单金额")
+    private BigDecimal money;
+    @ApiModelProperty("拉起确认收款页面参数")
+    private String packageInfo;
+
 }

--
Gitblit v1.7.1