Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java

@@ -36,9 +36,14 @@
    *
    * @param page
    * @param rotation
    * @param isAdministrator
    * @return
    */
   List<RotationVO> selectRotationPage(IPage page,@Param("rotation") RotationVO rotation);
   List<RotationVO> selectRotationPage(IPage page,
                              @Param("rotation") RotationVO rotation,
                              @Param("isAdministrator") Integer isAdministrator,
                              @Param("regionChildCodesList") String regionChildCodesList,
                              @Param("gridCodeList") String gridCodeList);


}