fix 合并错误
delete repeat has_many
Merge branch 'master' of github.com:mindpin/eshare
Merge branch 'master' of github.com:mindpin/eshare