Merge pull request #878 from callinglove/wvp-28181-2.0

648540858

2023-06-01 0c5b30e74f46d71ff1f2dc08ad55f003f29852dd

 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java

@@ -17,7 +17,6 @@
    @Autowired
    private DeviceAlarmMapper deviceAlarmMapper;


    @Override
    public PageInfo<DeviceAlarm> getAllAlarm(int page, int count, String deviceId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime) {
        PageHelper.startPage(page, count);