数据库修改
Merge branch 'master' of https://github.com/Foboy/GoGoJP

Conflicts:
	鏁版嵁搴撹璁″強鑴氭湰/鏁版嵁搴撹剼鏈?Untitled.sql
数据库脚本跟新