发送邮件

Signed-off-by: mahaitao <354650951@qq.com>
下午

Signed-off-by: mahaitao <354650951@qq.com>
111

Signed-off-by: mahaitao <354650951@qq.com>
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	WebContent/login/register.jsp
	src/com/gmteam/spiritdata/login/service/LoginServiceImpl.java
pom

Signed-off-by: mahaitao <354650951@qq.com>
Signed-off-by: mahaitao <354650951@qq.com>
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	.gitignore
	pom.framework.xml
	pom.xml


Signed-off-by: mahaitao <354650951@qq.com>