Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-14 997bf5ea58c2741b1862a1010bf5d60a32850c4f

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -410,7 +410,7 @@
            driverMapper.updateById(driver1);
            LoginWarpper loginWarpper = new LoginWarpper();
            loginWarpper.setId(driver1.getId());
            return ResultUtil.error("电话号码已使用", loginWarpper);
            return ResultUtil.success(loginWarpper);
        }


@@ -418,7 +418,7 @@
        if(null != driver1){
            LoginWarpper loginWarpper = new LoginWarpper();
            loginWarpper.setId(driver1.getId());
            return ResultUtil.error("电话号码已使用", loginWarpper);
            return ResultUtil.success(loginWarpper);
        }
        Driver driver = new Driver();
        driver.setAccount(phone);