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-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java
index 6244d4a..322ec35 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java
@@ -10,9 +10,11 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -41,7 +43,7 @@
@ApiModelProperty("申请时间")
@TableField("apply_for_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyForTime;
@ApiModelProperty("申请金额")
@@ -60,5 +62,29 @@
@TableField("order_id")
private String orderId;
+ @ApiModelProperty("城市code")
+ @TableField("city_code")
+ private String cityCode;
+ @ApiModelProperty("用户信息")
+ @TableField(exist = false)
+ private UserVO user;
+ @ApiModelProperty("提现进度")
+ @TableField(exist = false)
+ private List<WithdrawRecord> withdrawRecords;
+
+ @ApiModelProperty("旧机品类")
+ @TableField(exist = false)
+ private String serveName;
+ @ApiModelProperty("回收单金额")
+ @TableField(exist = false)
+ private BigDecimal servePrice;
+ @ApiModelProperty("补贴金额")
+ @TableField(exist = false)
+ private BigDecimal subsidy;
+ @ApiModelProperty("用户地址")
+ @TableField(exist = false)
+ private String reservationAddress;
+
+
}
--
Gitblit v1.7.1