From 96d936331f7840b8157b64ad8bb9cbace99c1557 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 21:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java |   14 ++++++++++++--
 1 files changed, 12 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..0ef8657 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
@@ -90,6 +90,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