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

gonglilong

2024-09-14 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/service/impl/SchedulingRecordServiceImpl.java

@@ -20,6 +20,11 @@

   @Override
   public IPage<SchedulingRecordVO> selectPage(IPage<SchedulingRecordVO> page, SchedulingRecordVO schedulingRecordVO) {
      return baseMapper.selectRecordPage(page,schedulingRecordVO);
      return page.setRecords(baseMapper.selectRecordPage(page,schedulingRecordVO));
   }

   @Override
   public SchedulingRecordVO customizeGetDetail(SchedulingRecordVO schedulingRecordVO) {
      return baseMapper.customizeGetDetail(schedulingRecordVO);
   }
}