Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection.git

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -36,7 +36,6 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/addUser")
     public String addUser(@RequestBody User user) throws Exception{
     	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
-    	if(1==1) throw new Exception("dddd");
     	userService.insert(user);
     	return super.returnResult(0, "添加成功", null);
     }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -68,8 +68,6 @@ public class UserServiceImpl extends BaseService implements UserService {
 
     @Override
     public void insert(User user) {
-    	User b=null;
-    	b.getAge();
     	userInfoDao.insert(user);
     }