Merge branch '6170' into dyf-device

2025-09-28 18:19:21 +08:00
parent 5230a95865 7d56e2e80e
commit 1898fe5db9
9 changed files with 89 additions and 26 deletions
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@ -241,9 +241,11 @@
    <select id="queryWebDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.WebDeviceVo">
        select * from (select  d.id, d.device_name,
        d.device_mac,
+        d.device_type,
        d.device_sn,
        d.device_imei,
        d.device_pic,
+        d.group_id,
        dt.type_name,
        dt.communication_mode,
        d.bluetooth_name,