Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/grid/mapper/GridMapper.java

@@ -67,7 +67,7 @@
   /**
    * 空间分析 mysql 5.7  点落面
    */
   GridEntity spatialAnalysis(@Param("point")String point);
   List<GridEntity> spatialAnalysis(@Param("point")String point);

   /**
    * 根据参数查询网格数据
@@ -129,4 +129,11 @@
    */
    GridEntity getGridByNames(@Param("gridName") String gridName,
                       @Param("communityName")  String communityName);

   /**
    * 查询用户对应的网格
    * @param userId
    * @return
    */
    List<String> getGridListByUserId(@Param("userId") String userId);
}