#MOD 设备分页反显商户

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

@@ -18,6 +18,7 @@
         <result column="freeze_status" property="freezeStatus"/>
         <result column="device_img" property="deviceImg"/>
         <result column="update_time" property="updateTime"/>
+        <result column="merc_name" property="mercName"/>
         <result column="create_time" property="createTime"/>
 
         <association property="deviceSysinfo" javaType="com.xy.dto.DeviceSysinfoDto$Vo">