Signed-off-by: wangjinlong <450149261@qq.com>
Merge branch 'master' of https://github.com/ynpay/ynpay

Conflicts:
	ynpay-user-agent/src/main/java/net/tiangu/ynpay/user/agent/entity/User.java
Merge branch 'master' of https://github.com/ynpay/ynpay.git

Conflicts:
	ynpay-user-agent/src/main/java/net/tiangu/ynpay/user/agent/service/UserService.java