Browse Source

Merge branch 'master' into test

李进 1 year ago
parent
commit
db44c6b6f8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

+ 2 - 0
device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -50,6 +50,7 @@
             <result column="is_have_light_second" property="isHaveLightSecond"/>
             <result column="is_have_freeze" property="isHaveFreeze"/>
             <result column="is_have_heat" property="isHaveHeat"/>
+            <result column="device_model" property="deviceModel"/>
         </association>
         <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
             <result column="sys_start_time" property="sysStartTime"/>
@@ -125,6 +126,7 @@
         sysinfo.is_have_light_second,
         sysinfo.is_have_freeze,
         sysinfo.is_have_heat,
+        sysinfo.device_model,
         status.sys_start_time,
         status.sys_cur_time,
         status.sys_power,