From 2e10dd5a3cb31a6bcce1da08c69bb927f22d3bac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 18:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java | 17 +++++++++++++++--
1 files changed, 15 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..18be1e5 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,10 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+
+import java.util.Date;
@Data
@ApiModel(value = "AdminMallOrderRefundVo", description = "信息返回类")
@@ -9,9 +12,11 @@
private Long id;
- private String name;
+ private String buyName;
- private String phone;
+ private String buyPhone;
+
+ private String addressDetail;
private Long orderId;
@@ -30,5 +35,13 @@
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;
}
--
Gitblit v1.9.1