diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
index 3a4bf25..d4b1695 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
@@ -87,7 +87,7 @@ public class AppDeviceController extends BaseController {
      * 根据mac查询设备信息
      */
     @GetMapping("/getDeviceInfoByDeviceMac")
-    public R<Device> getDeviceInfo(String deviceMac) {
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
         return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 }
diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
index 4d9a8de..3c0d9be 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
@@ -284,13 +284,10 @@ public class DeviceBizService {
         return null;
     }
 
-    public Device getDeviceInfo(String deviceMac) {
-        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_mac", deviceMac);
-        List<Device> devices = deviceMapper.selectList(queryWrapper);
-        if(ObjectUtils.length(devices) ==0){
-            return null;
-        }
-        return devices.get(0);
+    public AppDeviceVo getDeviceInfo(String deviceMac) {
+//        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("device_mac", deviceMac);
+//        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        return deviceMapper.getDeviceInfo(deviceMac);
     }
 }
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
index d767a99..96bbfce 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
@@ -67,4 +67,5 @@ public interface DeviceMapper extends BaseMapper<Device> {
      */
     List<Device> findByOriginalDeviceId(Long originalDeviceId);
 
+    AppDeviceVo getDeviceInfo(@Param("deviceMac") String deviceMac);
 }
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index 37b0192..615c86a 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -212,5 +212,22 @@
         FROM device
         WHERE original_device_id = #{originalDeviceId}
     </select>
+    <select id="getDeviceInfo" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
+        select d.id, d.device_name, d.device_name,
+        d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        d.bluetooth_name,
+        dt.model_dictionary detailPageUrl,
+        c.binding_time
+        from device d
+        inner join device_type dt on d.device_type = dt.id
+        inner join app_device_bind_record c on d.id = c.device_id
+        where d.device_mac = #{deviceMac}
+    </select>
 
 </mapper>
\ No newline at end of file