Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-10-27 e259be9268db90b4e73a325abea24ad59ff0e4e3

 src/main/java/com/genersoft/iot/vmp/service/IDeviceAlarmService.java

@@ -38,6 +38,6 @@
     * @param deviceIdList 制定需要清理的设备id
     * @param time 不写时间则清空所有时间的
     */
    void clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);
    int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);

}