Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-09 3413151b3bc4894110a34504a2359a528eb4aae9

 src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java

@@ -37,7 +37,7 @@
public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements IInformationService {

   @Override
   public IPage<InformationVO> selectInformationPage(IPage<InformationVO> page, InformationVO information) {
   public IPage<Information> selectInformationPage(IPage<Information> page, Information information) {
      return page.setRecords(baseMapper.selectInformationPage(page, information));
   }

@@ -96,4 +96,14 @@
      return baseMapper.selectSoil(deptid);
   }

   /**
    * 查询培训单位信息(可以报名)
    * @param page
    * @param information 保安单位信息对象
    * @return
    */
   @Override
   public IPage<InformationVO> securityPage(IPage<InformationVO> page, InformationVO information) {
      return page.setRecords(baseMapper.securityPage(page, information));
   }
}