Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-04-18 f2d0713c2b20a6c751399e2468996eafb8812988

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java

@@ -1,5 +1,6 @@
package cn.gistack.sm.damSecurity.mapper;

import cn.gistack.nky.entity.AlarmGet;
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,4 +71,7 @@
   DamStatisticsRes damResInfoCountWy(@Param("adCode") String adCode);


    List<AlarmGetVO> getLatestResRecord(@Param("alarmGet")AlarmGet alarmGet);

   List<AlarmGetVO> getLatestResRecordWy(@Param("alarmGet") AlarmGet alarmGet);
}