From f8d94f4c0f3441c9e1e54a163d2d5395ced2ee5c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 16:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
index 9d4a048..ffc8d6b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
@@ -1,8 +1,11 @@
package com.ruoyi.order.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.time.LocalDateTime;
/**
* @author zhibing.pu
@@ -20,11 +23,14 @@
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("申请时间")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
@ApiModelProperty("售后类型（1退货退款2仅退款）")
private Integer refundMethod;
@ApiModelProperty("申请原因")
private String refundReason;
+ @ApiModelProperty("1待审核2已完成3已拒绝4待退货5待平台收货")
+ private Integer status;
@ApiModelProperty("状态（1待审核2同意3拒绝）")
private Integer passStatus;
/**
--
Gitblit v1.7.1