修复单位转换错误
修改conversation_applies中的字段
Merge branch 'dev' of github.com:souche/cheniu_auction into dev

Conflicts:
	db/schema.rb