Merge branch 'dev' into 'main'

Dev

See merge request !168

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/impl/GridRegionServiceImpl.java

@@ -181,6 +181,7 @@ public class GridRegionServiceImpl extends BaseServiceImpl<GridRegionMapper, Gri
         criteria.andWgTypeEqualTo(wgType);
         criteria.andWgCodeNotEqualTo(wgCode);
         criteria.andWgCodeLike("%"+wgCode+"%");
+        criteria.andLevelEqualTo("3");
         return gridRegionMapper.selectByExampleWithBLOBs(example);
     }