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}, '%')) - AND create_time >= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss') + AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') - AND create_time <= to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss') + AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')