Merge branch 'dev' into 'main'

Dev

See merge request !159

ruoyi-system/src/main/java/com/ruoyi/system/service/other/impl/MapEntityServiceImpl.java

@@ -39,7 +39,7 @@ public class MapEntityServiceImpl implements MapEntityService {
         criteria.andLevelEqualTo(level);
         criteria.andWgTypeEqualTo("1");
 
-        List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
+        List<GridRegion> gridRegionList = gridRegionMapper.selectByExampleWithBLOBs(example);
         List<MapEntity> mapEntityList = new ArrayList<>();
         for (GridRegion gridRegion : gridRegionList) {
             MapEntity mapEntity = new MapEntity();
@@ -49,7 +49,7 @@ public class MapEntityServiceImpl implements MapEntityService {
             mapEntity.setEntityLevel(new Integer(gridRegion.getLevel()));
             mapEntity.setEntityName(gridRegion.getWgName());
             mapEntity.setParentEntity(gridRegion.getWgParentId());
-            mapEntity.setEntityScope(gridRegion.getWgArea());
+            mapEntity.setEntityScope(gridRegion.getWgCoordinate());
             mapEntity.setCoordinateAddress(gridRegion.getWgCentreCoordinate());
             mapEntity.setValid(1);
             mapEntity.setQrCode(gridRegion.getWgPrincipal());