Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !231

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -1084,6 +1084,7 @@ public class RegionController extends BaseController {
 
         criteria.andIsValidEqualTo("1");
         criteria.andLevelEqualTo("2");
+        criteria.andWgTypeEqualTo("1");
 
         List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
         return AjaxResult.success(gridRegionList);