Merge remote-tracking branch 'origin/master'

linwei

2024-01-22 8bbcf203caac16c26ef879e0d85ceed1c6f061f4

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

@@ -55,7 +55,7 @@
    * @param houseCode
    * @return
    */
    GridVO getGridDetailByHouseCode(@Param("houseCode") String houseCode);
    GridVO getPlaceGridDetailByHouseCode(@Param("houseCode") String houseCode);

   /**
    * 根据用户id(网格员)查询对应的房屋地址code
@@ -113,4 +113,11 @@
    * @return
    */
   List<GridVO> getGridListByAoiCode(@Param("aoiCode") String aoiCode);

   /**
    * 查询对应网格人对应的网格
    * @param userId
    * @return
    */
    GridEntity getGridByUserId(@Param("userId") Long userId);
}