From a6a3bb04cdaa334a2868d09b20518ed98575bccb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 七月 2024 18:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java b/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
index 8f77119..cefa44c 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/FeedbackVO.java
@@ -1,5 +1,6 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -27,8 +28,11 @@
private Boolean fix;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime fixTime;
+ private Boolean deleted;
+
private Integer pageIndex;
private Integer pageSize;
--
Gitblit v1.8.0