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

侯瑞军

2020-04-08 1bae504cec0247b87ba85006d90835b70ce713ff

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

@@ -50,12 +50,12 @@
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping
    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
    public PageResult<SysHospital> list(@RequestParam Map<String, Object> params) {
        if(params.size()==0){
            params.put("page",1);
            params.put("limit",10);
        }
        return ResultBody.ok().data(sysHospitalService.findList(params));
        return sysHospitalService.findList(params);
    }

    /**