设备分页 -货道数量

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

@@ -27,6 +27,7 @@
         <result column="place_name" property="placeName"/>
         <result column="place_line_name" property="placeLineName"/>
         <result column="district_name" property="districtName"/>
+        <result column="aisle_num" property="aisleNum"/>
 
         <association property="deviceSysinfo" javaType="com.xy.dto.DeviceSysinfoDto$Vo">
             <result column="sysinfo_device_sn" property="deviceSn"/>
@@ -331,7 +332,8 @@
         </if>
         <if test="queryPage.merc != null and queryPage.merc != ''">
             and (
-            info.merc_id = #{queryPage.merc} or info.merc_code like concat(#{queryPage.merc}, '%') or LOCATE(#{queryPage.merc}, mr.name) > 0
+            info.merc_id = #{queryPage.merc} or info.merc_code like concat(#{queryPage.merc}, '%') or
+            LOCATE(#{queryPage.merc}, mr.name) > 0
             )
         </if>
         <if test="queryPage.placeId != null">