更新！

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/DeviceInfoDaoImpl.java

@@ -44,8 +44,8 @@ public class DeviceInfoDaoImpl extends BaseImpl implements DeviceInfoDaoExtend {
             criteria.and("projectInfoCode").is(param.getProjectInfoCode());
         }
 
-        if (param.getDeviceModel() != null) {
-            criteria.and("deviceModel").is(param.getDeviceModel());
+        if (param.getSpecType() != null) {
+            criteria.and("specType").is(param.getSpecType());
         }
 
         if (param.getDeviceType() != null) {

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotTemplate2DeviceService.java

@@ -85,7 +85,7 @@ public class IotTemplate2DeviceService {
             return ResultContent.buildFail("iotTemplateId不能为空");
         }
         // 查询设备
-        if (StringUtils.isNotEmpty(param.getDeviceId()) || StringUtils.isNotEmpty(param.getDeviceName()) || param.getDeviceType() != null || param.getDeviceModel() != null || StringUtils.isNotEmpty(param.getProjectInfoCode()) || param.getOnLineState() != null) {
+        if (StringUtils.isNotEmpty(param.getDeviceId()) || StringUtils.isNotEmpty(param.getDeviceName()) || param.getDeviceType() != null || param.getSpecType() != null || StringUtils.isNotEmpty(param.getProjectInfoCode()) || param.getOnLineState() != null) {
             Pageable pageable1 = PageRequest.of(0, 10000);
             DeviceInfoSearchParam searchParam = new DeviceInfoSearchParam();
             BeanUtils.copyProperties(param, searchParam);