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

jinpengyong

2023-11-14 931734244f977a65dd35c6f606afb999d7c3c967

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

@@ -5,6 +5,7 @@

import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import io.lettuce.core.dynamic.annotation.Param;

/**
@@ -34,4 +35,6 @@

    List<String> deviceMacs(@Param("organizationId") int organizationId);

    List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId);

}