From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
index f51d012..b5606ad 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
@@ -63,6 +63,10 @@
@TableField("auth_time")
private LocalDateTime authTime;
+ @ApiModelProperty(value = "平台收货时间")
+ @TableField("receive_time")
+ private LocalDateTime receiveTime;
+
@ApiModelProperty(value = "后台审核备注")
@TableField("pass_remark")
private String passRemark;
@@ -90,6 +94,16 @@
@ApiModelProperty("快递单号")
@TableField("code")
private String code;
-
-
+
+ @ApiModelProperty("收货地址JSON")
+ @TableField(exist = false)
+ private String addressJson;
+
+ @ApiModelProperty(value = "第三方快递结果")
+ @TableField("express_result")
+ private String expressResult;
+
+ @ApiModelProperty("最新快递信息")
+ @TableField(exist = false)
+ private String express;
}
--
Gitblit v1.7.1