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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

 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) {