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

zhongrj

2023-06-19 a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804

 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);
   }
}