Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/ShiinaMinatus/wchatplatform.git

Conflicts:
	Lib/Yajie/Tpl/User/registration.tpl