From 28e68c33134c4934bdeee1498992c29a989f8878 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 五月 2026 10:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/estate_expert
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DaiguanDeviceReportData.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DaiguanDeviceReportData.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DaiguanDeviceReportData.java
index a4c6e7b..706e601 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DaiguanDeviceReportData.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/DaiguanDeviceReportData.java
@@ -67,7 +67,7 @@
/**
* 按设备类型汇总设备信息，供新版设备报告使用。
*/
- private List<Object> buildDeviceGroupInfo() {
+ protected List<Object> buildDeviceGroupInfo() {
Map<String, List<Device>> groupedDevices = devices.stream()
.sorted(Comparator.comparing(device -> device.getType() != null ? device.getType().ordinal() : Integer.MAX_VALUE))
.collect(java.util.stream.Collectors.groupingBy(
--
Gitblit v1.7.1