Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !40 from 平凡/master

Browse Source
This commit is contained in:
平凡 2020-07-17 23:41:32 +08:00 committed by Gitee
commit ecc966a78e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
View File

@ -196,7 +196,7 @@ public class SysUser extends BaseEntity
{
this.avatar = avatar;
}
@JsonIgnore
@JsonProperty
public String getPassword()
{

12
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
View File

@ -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>