From d20a4aade6f9ed5111b496ac9abdff9f05f81535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 22:32:02 +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, 10 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..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("商品信息")
@@ -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