Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-08 09481ada804b04e6458c8fa462e187a9b3007ee7

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java

@@ -52,7 +52,7 @@
        PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
        List<Long> listAirId = baseMapper.listAirId(keyword,clientId);
        if(CollUtil.isEmpty(listAirId)){
            return null;
            return CollUtil.newArrayList();
        }
        List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;