Merge remote-tracking branch 'origin/master'

linwe

2024-05-28 922b12a06599bc7118c4759571b9b9fe06a2e63d

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

@@ -41,6 +41,7 @@
   List<GridWorkLogVO> selectGridWorkLogPage(IPage page,
                                   @Param("gridWorkLog") GridWorkLogVO gridWorkLog,
                                   @Param("regionChildCodesList") List<String> regionChildCodesList,
                                   @Param("gridCodeList") List<String> gridCodeList,
                                   @Param("isAdministrator") Integer isAdministrator);

   /**