diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
index a7b444e..a3b9032 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
@@ -11,4 +11,5 @@ public class DevInfoVo extends DevInfo {
     private long parentId;
     private String typeName;
     private String companyName;
+    private String keyWord;
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
index a175e78..7610efe 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java
@@ -33,7 +33,7 @@ public class DevInfoController extends BaseController
      * 查询设备信息列表
      */
     @RequiresPermissions("equip:info:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
     public TableDataInfo list(DevInfoVo devInfo)
     {
         startPage();
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 6a68975..0a46192 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -63,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creator != null "> and d.creator = #{creator}</if>
             <if test="deposit != null "> and d.deposit = #{deposit}</if>
             <if test="isActive != null  and isActive != ''"> and d.is_active = #{isActive}</if>
+            <if test="keyWord != null and keyWord != ''">
+                and (
+                    locate(#{typeName},t.type_name) > 0
+                    or locate(#{companyName},c.company_name) > 0
+                    or locate(#{maId},d.ma_id) > 0
+                    or locate(#{modelName},d.model_name) > 0
+                    or locate(#{serialNumber},d.serial_number) > 0
+                    or locate(#{description},d.description) > 0
+                )
+            </if>
         </where>
     </select>