From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 36e81d5..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
@@ -51,7 +51,7 @@
 	@ApiModelProperty("审核状态(1待审核2同意3拒绝)")
 	private Integer passStatus;
 	@ApiModelProperty("审核注释")
-	private Integer passRemark;
+	private String passRemark;
 	@ApiModelProperty("售后申请时间")
 	private String passCreateTime;
 	@ApiModelProperty("售后类型(1退货退款2仅退款)")
@@ -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