Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
冷冷 2018-04-03 15:39:50 +08:00
commit cf522a855d
1 changed files with 1 additions and 1 deletions

View File

@ -86,7 +86,7 @@
`user`.salt,
`user`.introduction,
`user`.avatar,
`user`.create_time AS create_time,
`user`.create_time AS ucreate_time,
`user`.update_time AS uupdate_time,
`user`.del_flag AS udel_flag,
r.role_id,