From ca2486544c417605450b6ff7d7e53b7aa6324c0e Mon Sep 17 00:00:00 2001
From: Penny <2500338766@qq.com>
Date: Mon, 28 Aug 2023 13:35:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rights-admin-controller/.gitignore                           | 5 ++++-
 .../main/java/com/cyjd/rights/entity/RefundOrderEntity.java  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/rights-admin-controller/.gitignore b/rights-admin-controller/.gitignore
index 5ff6309..54715d4 100644
--- a/rights-admin-controller/.gitignore
+++ b/rights-admin-controller/.gitignore
@@ -4,9 +4,12 @@ target/
 !**/src/test/**/target/
 
 ### IntelliJ IDEA ###
+.idea/
 .idea/modules.xml
 .idea/jarRepositories.xml
 .idea/compiler.xml
+.idea/encodings.xml
+.idea/runConfigurations.xml
 .idea/libraries/
 *.iws
 *.iml
@@ -35,4 +38,4 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java b/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java
index 8d73e60..c6ca867 100644
--- a/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java
+++ b/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java
@@ -3,6 +3,7 @@ package com.cyjd.rights.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,6 +21,7 @@ public class RefundOrderEntity {
     private String mobile;
 
     //退款时间
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime refundTime;
 
     //商户订单号 对应支付表的other_order_id