Merge remote-tracking branch 'origin/master'

lin

2024-05-20 0814274c6ef53f39d9460e4d029717c9eff999e0

 src/main/java/org/springblade/modules/police/mapper/PoliceAffairsGridMapper.java

@@ -38,7 +38,12 @@
    * @param policeAffairsGrid
    * @return
    */
   List<PoliceAffairsGridVO> selectPoliceAffairsGridPage(IPage page, PoliceAffairsGridVO policeAffairsGrid);
   List<PoliceAffairsGridVO> selectPoliceAffairsGridPage(IPage page,
                                            @Param("policeAffairsGrid") PoliceAffairsGridVO policeAffairsGrid,
                                            @Param("isAdministrator") Integer isAdministrator,
                                            @Param("regionChildCodesList") List<String> regionChildCodesList,
                                            @Param("gridCodeList") List<String> gridCodeList
   );

   /**
    * 空间分析