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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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

@@ -211,9 +211,9 @@
     */
    @ApiOperation(value = "用户查询列表")
    @GetMapping("/users/HDoctorusers")
    public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
    public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
        if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
            return appUserService.hospitalDoctorList(hospitalId, departmentId);
            return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
        } else {
            return ResultBody.failed("查询参数有误");
        }