更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
@@ -39,7 +39,7 @@ public class DeviceInfoModel extends SuperModel {
     }
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     private String deviceModelStr;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.type.OnLineState;
@@ -23,7 +23,7 @@ public class DeviceInfoParam extends SuperParam {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     @Schema(description = "网关号")
     private String gateWayId;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.OnLineState;
@@ -39,7 +39,7 @@ public class DeviceInfoSearch extends SuperSearch {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     @Schema(description = "网关号")
     private String gateWayId;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/deviceProduct/DeviceProductBindDeviceModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.deviceProduct;
 
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
@@ -44,6 +44,6 @@ public class DeviceProductBindDeviceModel extends SuperModel {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
 }

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/deviceProduct/DeviceProductBindDeviceSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.deviceProduct;
 
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,5 +29,5 @@ public class DeviceProductBindDeviceSearch extends SuperSearch {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
@@ -55,7 +55,7 @@ public class DeviceInfo extends SuperMain {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 
     @Schema(description = "网关号")
     private String gateWayId;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceProductBindDevice.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.devices;
 
-import com.github.microservice.models.type.DeviceModel;
+import com.github.microservice.models.type.DeviceSpecType;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -45,5 +45,5 @@ public class DeviceProductBindDevice extends SuperMain {
     private DeviceType deviceType;
 
     @Schema(description = "设备型号")
-    private DeviceModel deviceModel;
+    private DeviceSpecType deviceModel;
 }