From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index 7c97847..b8cbc69 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -19,6 +19,8 @@
private String code;
@ApiModelProperty("下单时间")
private String createTime;
+ @ApiModelProperty("售后截止时间")
+ private String afterSaleTime;
@ApiModelProperty("下单用户")
private String userName;
@ApiModelProperty("联系电话")
@@ -29,11 +31,14 @@
private Integer paymentType;
@ApiModelProperty("订单金额")
private BigDecimal orderMoney;
+ @ApiModelProperty("订单积分")
+ private BigDecimal point;
@ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
private Integer status;
-
/**
* 用户id
*/
private Long appUserId;
+ @ApiModelProperty("售后订单id")
+ private String refundPassId;
}
--
Gitblit v1.7.1