From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtArticlePageDto.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtArticlePageDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtArticlePageDto.java
index 87c12fa..9541f75 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtArticlePageDto.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtArticlePageDto.java
@@ -4,8 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @ClassName MgtArticlePageDto
  * @Description TODO
@@ -20,8 +18,8 @@
     private String articleTitle;
 
     @ApiModelProperty(value = "创建开始时间")
-    private Date createStartTime;
+    private String createStartTime;
 
     @ApiModelProperty(value = "创建结束时间")
-    private Date createEndTime;
+    private String createEndTime;
 }

--
Gitblit v1.7.1