floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 12:45:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merge from hh_develop

Browse Source
This commit is contained in:
vilet.yy
2021-06-04 18:36:33 +08:00
parent 2ea9fcd4d7 ed8d646d47
commit 12c252ea10
25 changed files with 270 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user_extension.rb
View File

@@ -22,12 +22,15 @@
# school_id :integer
# description :string(255) default("")
# department_id :integer
<<<<<<< HEAD
# province :string(255)
# city :string(255)
# custom_department :string(255)
# show_email :boolean default("0")
# show_location :boolean default("0")
# show_department :boolean default("0")
=======
>>>>>>> ed8d646d479bdcd84784909a024949bb8e4f093f
#
# Indexes
#