Merge branch 'dev' into 'main'

Dev

See merge request !84

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

@@ -1301,7 +1301,7 @@ public class GridRegionFacadeService {
 //        }
 //        example.setOrderByClause(" wg_code");
 
-        int count = 25;
+        int count = 5;
         List<GridRegion> roles = new ArrayList<>();
         List<String> type = new ArrayList<>();
         type.add("1");
@@ -1317,18 +1317,16 @@ public class GridRegionFacadeService {
         name.add("市场");
 
         for(int i=0;i<5;i++){
-            for(int j=0;j<5;j++){
                 GridRegion gridRegion = new GridRegion();
                 gridRegion.setWgCode(wgCode);
                 gridRegion.setStatus("2");
                 gridRegion.setId(UUID.randomUUID().toString());
                 gridRegion.setWgType(type.get(i));
                 gridRegion.setLevel("2.5");
-                gridRegion.setWgName(name.get(j));
+                gridRegion.setWgName(name.get(i));
                 gridRegion.setIsValid("1");
                 roles.add(gridRegion);
         }
-        }
 
 
 //        List<GridRegion> roles = gridRegionService.selectByExampleWithBLOBsForStartPage(example, pageNum, pageSize);