From b816db1c4afe6d137d379786377cc735edbf2192 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 20:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 df17beb..ad16c18 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
@@ -59,13 +59,19 @@
@TableField("pass_status")
private Integer passStatus;
+ @ApiModelProperty(value = "审核时间")
+ @TableField("auth_time")
+ private LocalDateTime authTime;
+
+ @ApiModelProperty(value = "平台收货时间")
+ private LocalDateTime receiveTime;
+
@ApiModelProperty(value = "后台审核备注")
@TableField("pass_remark")
private String passRemark;
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -87,6 +93,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