删除target
处理冲突
处理冲突
Merge branch 'develop'
重新添加responseData类处理请求参数
Merge branch 'develop'
Merge branch 'master' of https://github.com/nezhazheng/UnionLoginCenter

Conflicts:
	src/main/java/com/boyacai/unionlogin/controller/UnionLoginController.java