Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/utils/TreeUtil.java

@@ -61,6 +61,9 @@ public class TreeUtil {
                 setChildren1(node, list);
             }
         }
+        if (result.isEmpty()){
+            return list;
+        }
         return result;
     }