更新cotroller处理冲突
增加POJO:userRelation
Merge branch 'master' of https://github.com/nezhazheng/UnionLoginCenter into develop