diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
index 17b0eb23..86b5b9f3 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SearchDeviceRequest.java
@@ -15,6 +15,9 @@ public class SearchDeviceRequest extends PageRequest {
     // 设备型号
     private String modelNo;
 
+    // 设备编号或设备型号
+    private String key;
+
     //开始时间
     private LocalDate startTime;
 
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
index 98b4d7b8..ad4d57c2 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
@@ -86,6 +86,9 @@
         <if test="request.endTime!=null and request.endTime!=''">
             and d.shipment_date &lt;= #{request.endTime}
         </if>
+        <if test="request.key!=null and request.key!=''">
+            and (d.device_no LIKE concat('%', #{request.key}, '%') or d.model_no LIKE concat('%', #{request.key}, '%'))
+        </if>
     </select>
     <!--定时任务-质保未开始-->
     <update id="taskWarrantyStateNotStarted">