From 0238c4ad9210b1a45e7c626cfaf40367cb741b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=B3=E5=87=A1?= <hmxmylove@163.com>
Date: Sat, 18 Jul 2020 00:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E2=80=9C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E2=80=9D=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/tool/GenTableMapper.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
index d688599a7..0c58d720d 100644
--- a/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
@@ -62,12 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="tableComment != null and tableComment != ''">
 				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 			</if>
-<!-- 			<if test="beginTime != null and beginTime != ''">开始时间检索 -->
-<!-- 				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d') -->
-<!-- 			</if> -->
-<!-- 			<if test="endTime != null and endTime != ''">结束时间检索 -->
-<!-- 				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') -->
-<!-- 			</if> -->
+			<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+				AND create_time &gt;= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss')
+			</if>
+			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+				AND create_time &lt;= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+			</if>
 		</where>
 	</select>