Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-21 ff3af3a0dd0fe87a500c13e933bea1f553083508

 screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java

@@ -1,7 +1,5 @@
package com.moral.api.mapper;

import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

@@ -11,6 +9,7 @@
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.vo.device.DeviceVO;
import io.lettuce.core.dynamic.annotation.Param;

/**
 * <p>
@@ -24,6 +23,6 @@

    DeviceVO selectDeviceInfoById(Integer deviceId);

    List<Device> queryDeviceUnitAlarmInfo();
    List<Device> queryDeviceUnitAlarmInfo(@Param("region") String mac);

}