From d6903acf64a595e3849997eceea50402f2757686 Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Thu, 19 Jun 2025 18:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E6=A0=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/core/domain/TreeEntity.java    | 6 +++---
 .../main/java/org/dromara/common/core/utils/TreeUtils.java | 6 +++---
 .../main/java/org/dromara/iot/service/ITdMeterService.java | 7 +++----
 .../main/java/org/dromara/property/domain/SysCityArea.java | 3 ++-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeEntity.java
index 92653b4..a1f3079 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeEntity.java
@@ -7,9 +7,9 @@ import java.util.List;
  * @param <E>
  */
 public interface TreeEntity<E, T> {
-    public T getId();
+    T getId();
 
-    public T getParentId();
+    T getParentId();
 
-    public void setChildren(List<E> children);
+    void setChildren(List<E> children);
 }
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java
index 1a97516..68eb8a9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java
@@ -21,17 +21,17 @@ public class TreeUtils {
      * @param rootCode   根节点编码
      * @return 构建树状
      */
-    public static <T extends TreeEntity> List<T> getTreeList(List<T> entityList, Object rootCode) {
+    public static <T extends TreeEntity<T, ?>> List<T> getTreeList(List<T> entityList, Object rootCode) {
         if (CollectionUtil.isEmpty(entityList)) {
             return new ArrayList<>();
         }
         //第一次循环 数据分组
         Map<Object, List<T>> groupData = new HashMap<>();
         for (T entity : entityList) {
-            groupData.computeIfAbsent(entity.getParentId(), (k) -> new ArrayList<T>()).add(entity);
+            groupData.computeIfAbsent(entity.getParentId(), (k) -> new ArrayList<>()).add(entity);
         }
         // 第二次循环 生成树结构
-        for (TreeEntity entity : entityList) {
+        for (TreeEntity<T, ?> entity : entityList) {
             List<T> children = groupData.get(entity.getId());
             if (children != null) {
                 entity.setChildren(children);
diff --git a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java
index 248598a..b0189e2 100644
--- a/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java
+++ b/ruoyi-modules/Iot/src/main/java/org/dromara/iot/service/ITdMeterService.java
@@ -1,10 +1,9 @@
 package org.dromara.iot.service;
 
-import org.dromara.iot.domain.TdMeter;
-import org.dromara.iot.domain.vo.TdMeterVo;
-import org.dromara.iot.domain.bo.TdMeterBo;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.iot.domain.bo.TdMeterBo;
+import org.dromara.iot.domain.vo.TdMeterVo;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/SysCityArea.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/SysCityArea.java
index 2fa1e49..48d8a6e 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/SysCityArea.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/SysCityArea.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * 行政区划
@@ -15,7 +16,7 @@ import java.io.Serial;
  */
 @Data
 @TableName("sys_city_area")
-public class SysCityArea {
+public class SysCityArea implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;