Merge remote-tracking branch 'origin/master'

aijinhui

2023-08-31 6e54b432ab969eccb47b0aa388b95bf14e398790

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.github.pagehelper.PageInfo;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;

@@ -103,5 +104,5 @@

    List<ArdAlarmpointsWell> wellList(List<Long> deptList);

    List<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
    PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam);
}