Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java

@@ -39,7 +39,16 @@
    * @param checkInRecords
    * @return
    */
   List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page, @Param("checkInRecords") CheckInRecordsVO checkInRecords);
   List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page,
                                       @Param("checkInRecords") CheckInRecordsVO checkInRecords,
                                       @Param("deptIdList") List<Long> deptIdList);


//   List<CheckInRecordsVO> selectCheckInRecordsPage(IPage<CheckInRecordsVO> page,
//                                       @Param("checkInRecords")CheckInRecordsVO checkInRecords,
//                                       @Param("isAdministrator")   Integer isAdministrator,
//                                       @Param("gridCodeList")List gridCodeList,
//                                       @Param("regionChildCodesList")List regionChildCodesList);


   /**
@@ -57,4 +66,5 @@
    * @return 打卡记录表集合
    */
   public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO);

}