Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleServiceImpl.java

@@ -85,6 +85,12 @@
        return baseMapper.findAll();
    }

    @Override
    public List<SysRole> findByMap(Map<String, Object> params) {
        params.put("is_del",0);
        params.put("enabled",1);
        return baseMapper.selectByMap(params);
    }

    @Override
    public ResultBody updateEnabled(Map<String, Object> params) {