From 693afdd881d1ffcd31dcf4e40e562fd0f88b309b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 15:22:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
index 6e9c89f..4f20269 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
@@ -62,4 +62,12 @@
 	private String userRemark;
 	@ApiModelProperty("申请图片")
 	private String pics;
+	@ApiModelProperty("活动名称")
+	private String activityName;
+	@ApiModelProperty("1待审核2已完成3已拒绝4待退货5待平台收货")
+	private Integer status;
+	@ApiModelProperty("快递单号")
+	private String expressCode;
+	@ApiModelProperty("快递公司名称")
+	private String expressName;
 }

--
Gitblit v1.7.1