develop
Merge branch 'master' of github.com:hyrtyp/CNP_Account

Conflicts:
	CNP_Account.iml
	src/main/java/com/hyrt/cnp/account/request/UserDetailRequest.java
Merge branch 'master' of github.com:hyrtyp/CNP_Account

Conflicts:
	CNP_Account.iml
	src/main/AndroidManifest.xml
	src/main/java/com/hyrt/cnp/account/LoginActivity.java
solve conflict
no change
Merge branch 'develop' of github.com:hyrtyp/CNP_Account into develop
Merge branch 'master' into develop
add user ui