Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-05-29 08c7fcce9fa2a876412fa81a19550b77996214e2

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java

@@ -23,7 +23,10 @@
    * @return
    */
   @Override
   public IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
   public Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
      if (null != alarmRecord.getIsExport()){
         return baseMapper.selectAlarmRecordPage(null,alarmRecord);
      }
      return page.setRecords(baseMapper.selectAlarmRecordPage(page,alarmRecord));
   }
}