From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
index ecdcdfb..1b10ba1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WithdrawDetailVO.java
@@ -1,11 +1,13 @@
package com.ruoyi.order.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.order.entity.WithdrawRecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author HJL
@@ -17,7 +19,8 @@
@ApiModelProperty("订单id")
private String orderId;
-
+ @ApiModelProperty("拉起确认收款参数")
+ private String packageInfo;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -78,7 +81,7 @@
@ApiModelProperty("订单补贴金额")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
private Integer isWithdrawal;
@ApiModelProperty("提现申请状态(0待审核;1已通过;2已驳回)")
@@ -93,5 +96,6 @@
@ApiModelProperty("现场照片(多张照片 ','隔开)")
private String photo;
-
+ @ApiModelProperty("提现进度")
+ private List<WithdrawRecord> withdrawRecords;
}
--
Gitblit v1.7.1