Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master-碰一下' into test

tanbin 9 сар өмнө
parent
commit
5d21343617

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

@@ -53,6 +53,8 @@
             <result column="is_have_heat" property="isHaveHeat"/>
             <result column="device_model" property="deviceModel"/>
             <result column="screen_type" property="screenType"/>
+            <result column="is_have_alipay_npad" property="isHaveAlipayNpad"/>
+            <result column="nfc_sn" property="nfcSn"/>
         </association>
         <association property="deviceStatus" javaType="com.xy.dto.DeviceStatusDto$Vo">
             <result column="sys_start_time" property="sysStartTime"/>
@@ -188,6 +190,8 @@
         sysinfo.is_have_heat,
         sysinfo.device_model,
         sysinfo.screen_type,
+        sysinfo.is_have_alipay_npad,
+        sysinfo.nfc_sn,
         status.sys_start_time,
         status.sys_cur_time,
         status.sys_power,