From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java | 12 +++++++++++-
1 files changed, 11 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..b92ffee 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
@@ -44,6 +44,8 @@
private BigDecimal paymentAmount;
@ApiModelProperty("获得积分")
private Integer point;
+ @ApiModelProperty("获得积分")
+ private Integer getPoint;
@ApiModelProperty("商品数量")
private Integer goodsNum;
@ApiModelProperty("商品信息")
@@ -51,7 +53,7 @@
@ApiModelProperty("审核状态（1待审核2同意3拒绝）")
private Integer passStatus;
@ApiModelProperty("审核注释")
- private Integer passRemark;
+ private String passRemark;
@ApiModelProperty("售后申请时间")
private String passCreateTime;
@ApiModelProperty("售后类型（1退货退款2仅退款）")
@@ -62,4 +64,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