设备查询新增厂商字段

zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="longitude"    column="longitude"/>
         <result property="latitude"    column="latitude"/>
         <result property="childType"    column="child_type"/>
+        <result property="manufacturer"    column="manufacturer"/>
     </resultMap>
 
     <resultMap id="dcStakeMarkResult" type="dcStakeMark">
@@ -73,9 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name, t1.device_code, t1.device_type,
         t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,t1.use_state,t1.device_state,t1.other_config,t1.remark,
         t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.device_img,t1.child_type,
-        t1.facilities_type,t2.longitude,t2.latitude
+        t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer
         from dc_device t1
         left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
+        left join dc_product t3 on t3.id = t1.product_id
         <where>
             <if test="id != null  and id != ''">and t1.id = #{id}</if>
             <if test="iotDeviceId != null  and iotDeviceId != ''">and t1.iot_device_id = #{iotDeviceId}</if>