From ac1b28349aef03e2c963b367a24348475ea9b551 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 25 十月 2022 14:04:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java
index bf7351b..d1e8161 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java
@@ -7,6 +7,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -20,7 +21,7 @@
     private String adminId;
 
     @ExcelProperty(index = 0, value = "鏃ュ織鏃堕棿", format = "YYYY-mm-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ExcelProperty(index = 4, value = "IP鍦板潃")
     private String ip;

--
Gitblit v1.8.0