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/entity/Withdraw.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Withdraw.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Withdraw.java
index f2ff4dc..00a5db4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Withdraw.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Withdraw.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.user.api.entity.User;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -13,6 +14,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -68,4 +70,14 @@
@TableField("order_id")
private String orderId;
+ @ApiModelProperty("城市code")
+ @TableField("city_code")
+ private String cityCode;
+ @ApiModelProperty("用户信息")
+ @TableField(exist = false)
+ private User user;
+ @ApiModelProperty("提现进度")
+ @TableField(exist = false)
+ private List<WithdrawRecord> withdrawRecords;
+
}
--
Gitblit v1.7.1