Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeNode.java

@@ -0,0 +1,31 @@
+package org.dromara.common.core.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TreeNode<T> implements TreeEntity<TreeNode<T>, T> {
+    // 层级
+    private Integer level;
+    // 编码
+    private T code;
+    // 父编码
+    private T ParentCode;
+    // 标签
+    private String label;
+    // 子节点
+    private List<TreeNode<T>> children;
+
+    @Override
+    public T getId() {
+        return getCode();
+    }
+
+    @Override
+    public T getParentId() {
+        return getParentCode();
+    }
+
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java

@@ -21,7 +21,7 @@ public class TreeUtils {
      * @param rootCode   根节点编码
      * @return 构建树状
      */
-    public static <T extends TreeEntity<T, ?>> List<T> getTreeList(List<T> entityList, Object rootCode) {
+    public static <T extends TreeEntity<T, ?>> List<T> build(List<T> entityList, Object rootCode) {
         if (CollectionUtil.isEmpty(entityList)) {
             return new ArrayList<>();
         }