From 9dcea014cf9387cb1b3031f0a0f2a45007bffd9a Mon Sep 17 00:00:00 2001
From: gx_ma <1773945958@qq.com>
Date: Fri, 12 Jul 2024 15:29:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/iot/DeviceMapper.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml b/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
index ce3b60d0..cbd647db 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -245,7 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="selectDeviceShortList" parameterType="com.fastbee.iot.domain.Device" resultMap="DeviceShortResult">
-        select d.device_id, d.device_name, d.product_id, d.product_name,p.device_type,
+        select d.device_id, d.device_name, p.product_id, p.product_name,p.device_type,
             d.user_id, d.user_name, d.tenant_id, d.tenant_name, d.serial_number,d.gw_dev_code,
             d.firmware_version, d.status,d.rssi,d.is_shadow,d.is_simulate ,d.location_way,
             d.things_model_value, d.active_time,d.create_time,d.img_url,max(u.is_owner) as is_owner,