Merge remote-tracking branch 'origin/master'

lin

2024-03-11 c5a0d277347f9ecaaf934b648b6edf5b9119516b

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

@@ -39,7 +39,9 @@
    * @return
    */
   List<GridPatrolRecordVO> selectGridPatrolRecordPage(IPage page,
                                          @Param("gridPatrolRecord") GridPatrolRecordVO gridPatrolRecord);
                                          @Param("gridPatrolRecord") GridPatrolRecordVO gridPatrolRecord,
                                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                                          @Param("isAdministrator") Integer isAdministrator);


}