测试冲突
Merge remote-tracking branch 'origin/master'

Conflicts:
	business/business-user/src/main/java/org/whut/platform/business/user/entity/User.java