Merge remote-tracking branch 'origin/master'

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

@@ -260,6 +260,9 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="queryPage.keyword != null and queryPage.keyword != ''">
+            and CONCAT(IFNULL(info.device_name, ''), IFNULL(info.device_id, '')) LIKE CONCAT('%',#{queryPage.keyword},'%')
+        </if>
         <if test="queryPage.showStatus != null">
             and info.show_status = #{queryPage.showStatus}
         </if>

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -395,6 +395,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("缺货状态")
         private Integer stockStatus;
 
+        @ApiModelProperty("搜索词")
+        private String keyword;
+
         /**
          * 设备ID
          */