修改选项字段名称opts
修改选项字段名称opts
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_game/models/questioncategory.js
修改选项字段名称opts