dbまわりを修正
マージ前のコミット
Merge branch 'master' of https://github.com/tamuratt/pjSearch into tamuratt-master

Conflicts:
	app/models/user.rb
	db/schema.rb
push test
ユーザID（社員コード）で再ログインできなかった件の対応
Merge branch 'master' of https://github.com/ttamura204/pjSearch

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master' of https://github.com/Kouichi-MIyagi/pjSearch into Kouichi-MIyagi-master

Conflicts:
	app/models/user.rb
	db/schema.rb