Merge branch 'dev' into 'main'

Dev

See merge request !190

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

@@ -1380,7 +1380,7 @@ public class GridRegionFacadeService {
         type.add("7");
         List<String> name = new ArrayList<>();
         name.add("楼宇");
-        name.add("门店");
+        name.add("道路（门店）");
         name.add("街区");
         name.add("综合体");
         name.add("市场");