Merge remote-tracking branch 'origin/master'

guyue

1 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

 src/main/java/com/linghu/controller/UserController.java

@@ -43,7 +43,7 @@
    public ResponseResult add(@RequestBody User user) {
        List<User> list = userService.list(new LambdaQueryWrapper<User>().eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
            return ResponseResult.success("该邮箱已存在");
        }
        user.setStatus("正常");
        userService.save(user);
@@ -66,7 +66,7 @@
                        .ne(User::getUser_id, user.getUser_id())
                .eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
            return ResponseResult.success("该邮箱已存在");
        }
        userService.updateById(user);
        return ResponseResult.success();