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

houruijun

2020-09-01 d485902ae91b906ce542e51936bd460f0a3a5b08

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

@@ -52,7 +52,7 @@
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping
    public PageResult<SysDoctorVo> list(@RequestParam Map<String, Object> params,@LoginUser  SysUser user) {
    public PageResult<SysDoctorDto> list(@RequestParam Map<String, Object> params,@LoginUser  SysUser user) {
        if(params.size()==0){
            params.put("page",1);
            params.put("limit",10);