Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -62,12 +62,12 @@
    * @param userId
    * @return
    */
    List<String> getAddressCodeListByUserId(@Param("userId") Long userId);
    List<String> getAddressCodeListByUserId(@Param("userId") Long userId,@Param("addressCode") String addressCode);

   /**
    * 空间分析 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);
}