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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java

@@ -43,7 +43,9 @@
      }
      if (null!=smsResult.getIsExport()){
         // 导出，不分页
         return baseMapper.selectSmsResultPage(null,smsResult,list);
         List<SmsResultVO> resultVOList = baseMapper.selectSmsResultPage(null, smsResult, list);
         // 设置统计值
         return resultVOList;
      }
      // 查询返回
      return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list));