Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-30 10f65333417f064377b01a89064d2ce716603a07

 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java

@@ -1017,7 +1017,11 @@
        Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
        securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);

        return  Result.ok().data(page.getResult()).total(page.getTotal());
        // 统计数
        HashMap<String, Object> map = new HashMap<>();
        map.put("count", CollectionUtils.EMPTY_COLLECTION);
        map.put("list", page);
        return Result.ok().data(map).total(page.getTotal());

    }
}