[115] YangJing&JinWuxia: modify UserMappertest.java and UserMapper.java
[115] YangJing&JinWuxia: modify UserServiceImpltest.java and UserServiceImpl.java
[115] YangJing&JinWuxia: modify HomeController.java and HomeControllerTest.java and home.jsp
[115] YangJing&JinWuxia: modify UserController.java and UserControllerTest.java and profile.jsp
[115] YangJing&JinWuxia: resolve conflict