From 0d341f1aaa210119a3bad591f84438e48a7f602d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 18 Jul 2020 16:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/project/system/domain/SysUser.java    | 2 +-
 ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 65b4a6658..f63f59832 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
     {
         this.avatar = avatar;
     }
-    
+
 	@JsonIgnore
     @JsonProperty
     public String getPassword()
diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
index 0c58d720d..64a1f5e59 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -63,10 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 			</if>
 			<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-				AND create_time &gt;= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
 			</if>
 			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-				AND create_time &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 			</if>
 		</where>
 	</select>