Merge remote-tracking branch 'origin/master'

zengh

2021-02-27 939292b1cfd4fb4f714bb5ae09dbc2220cef06b4

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