Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
0d341f1a
Commit
0d341f1a
authored
Jul 18, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码生成查询条件修正
parent
11ab4b48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
...rc/main/java/com/ruoyi/project/system/domain/SysUser.java
+1
-1
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
+2
-2
No files found.
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
View file @
0d341f1a
...
...
@@ -197,7 +197,7 @@ public class SysUser extends BaseEntity
{
this
.
avatar
=
avatar
;
}
@JsonIgnore
@JsonProperty
public
String
getPassword
()
...
...
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
View file @
0d341f1a
...
...
@@ -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
>
= to_date(#{beginTime},'yyyy-MM-dd HH24:mi:ss
')
AND
date_format(create_time,'%y%m%d')
>
= date_format(#{beginTime},'%y%m%d
')
</if>
<if
test=
"endTime != null and endTime != ''"
>
<!-- 结束时间检索 -->
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
')
</if>
</where>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment