Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/java/com/moral/mapper/AlarmMapper.java

@@ -10,5 +10,5 @@


public interface AlarmMapper extends BaseMapper<Alarm> {

   

   List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format);

   List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format,@Param("list") List<String> list);

}