Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

克 刘

2020-04-16 004e1229ed36a98cc3bb9e3c0eb15be2ab8c0642

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

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

    /**
@@ -111,4 +111,12 @@
            return ResultBody.failed().msg("删除失败");
        }
    }
    /**
     *修改状态
     */
    @ApiOperation(value = "修改状态")
    @GetMapping("updateEnabled")
    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
        return sysCompanyService.updateEnabled(params);
    }
}