Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java

@@ -40,6 +40,7 @@
    * @return
    */
   List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
   List<AlarmVO> listAll();
   List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
   List<AlarmVO> getLimit();
   List<AlarmVO> selectListSe(String beginTime, String endTime);