From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性，用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
index 38fd93d..7ea3d44 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
@@ -1,7 +1,11 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
@Data
@ApiModel(value = "AdminMallOrderRefundVo", description = "信息返回类")
@@ -9,9 +13,13 @@
private Long id;
- private String name;
+ private String buyName;
- private String phone;
+ private String buyPhone;
+
+ private String buyBindPhone;
+
+ private String addressDetail;
private Long orderId;
@@ -30,5 +38,17 @@
private String expressNo;
+ /**
+ * 1-仅退款不退货 2-退款退货
+ */
+ private Integer type;
+
private String expressCom;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdTime;
+
+ private BigDecimal amount;
+
+ private Integer beforeStatus;
}
--
Gitblit v1.9.1