no change
NO CHANGE
no change
Merge branch 'develop' of github.com:hyrtyp/CNP_Base into develop

Conflicts:
	CNP_Base.iml
	src/main/java/com/hyrt/cnp/account/CNPClient.java
	src/main/java/com/hyrt/cnp/account/model/BaseTest.java
	src/main/java/com/hyrt/cnp/account/service/UserService.java
Merge branch 'master' into develop

Conflicts:
	CNP_Base.iml
Merge branch 'develop'