Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java

@@ -110,14 +110,7 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            boolean v= sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);

            if(v) {
                return ResultBody.ok().data(sysDoctor).msg("保存成功");
            }
            else {
                return ResultBody.failed().msg("保存失败");
            }
            return sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
        }
    }