Merge branch 'dev' into 'main'

Dev

See merge request !101

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -1248,7 +1248,7 @@ public class GridRegionFacadeService {
         firstNode.setName(gridRegion.getWgName());
         firstNode.setId(gridRegion.getId());
         firstNode.setChild(new ArrayList<>());
-        firstNode.setParentId("");
+        firstNode.setParentId(gridRegion.getWgParentId());
         firstNode.setWgArea(gridRegion.getWgArea());
         firstNode.setWgCoordinate(gridRegion.getWgCoordinate());
         firstNode.setWgCentreCoordinate(gridRegion.getWgCentreCoordinate());