Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -40,7 +40,10 @@
    * @param gridman
    * @return
    */
   List<GridmanVO> selectGridmanPage(IPage page,@Param("gridman") GridmanVO gridman);
   List<GridmanVO> selectGridmanPage(IPage page,
                             @Param("gridman") GridmanVO gridman,
                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                             @Param("isAdministrator") Integer isAdministrator);

   /**
    * 网格员查询