新增 设备名称，设备编号 合二为一并支持模糊搜索功能

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/IotDeviceListReqVo.java

@@ -37,7 +37,8 @@ public class IotDeviceListReqVo extends IotDevice {
     private String tid;
 
     private List<String> devtypeBidList;
-    /**通用查询字段，用于同时查询设备名称和设备标识 */
+
+    /** 设备编码 名称 合二为一 支持模糊搜索 */
     private String devQuery;
 
     /**

src/main/resources/mapper/IotDeviceMapper.xml

@@ -170,8 +170,9 @@
             </if>
             <if test="extInfo != null  and extInfo != ''">and d.extInfo = #{extInfo}</if>
             <if test="devVersion != null  and devVersion != ''">and d.devVersion = #{devVersion}</if>
-            <if test="devQuery != null and devQuery != ''">and (d.devCode like CONCAT("%",#{devQuery},"%") or d.devName
-                like CONCAT("%",#{devQuery},"%"))
+            <if test="devQuery != null and devQuery != ''">
+                and (d.devCode like CONCAT("%",#{devQuery},"%")
+                or d.devName like CONCAT("%",#{devQuery},"%"))
             </if>
             <if test="devtypeBidList != null  and devtypeBidList.size() > 0">
                 and d.devtypeBid in