Merge remote-tracking branch 'origin/master'

linwe

2023-11-30 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1

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

@@ -40,5 +40,10 @@
    */
   List<GridmanVO> selectGridmanPage(IPage page,@Param("gridman") GridmanVO gridman);


   /**
    * 网格员查询
    * @param gridman
    * @return
    */
    List<GridmanVO> getGridmanList(@Param("gridman") GridmanVO gridman);
}