Merge remote-tracking branch 'origin/master'

Administrator

2021-03-02 a644c4bb75b173d14fad9ed7dc7cf85c41d4953a

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -42,8 +42,8 @@
   }

   @Override
   public IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime,String addvcd,String type) {
      return page.setRecords(baseMapper.selectList(page,waringType,beginTime,endTime,addvcd,type));
   public List<JingdanVO> selectList(String waringType, String beginTime, String endTime,String addvcd,String type) {
      return baseMapper.selectList(waringType,beginTime,endTime,addvcd,type);
   }

   @Override