WEB：分页查询设备列表

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java

@@ -27,6 +27,14 @@ public class DeviceType extends TenantEntity {
     @Schema(name = "创建该类型的客户")
     private Long ownerCustomerId;
 
+    /**
+     * 原始所有者（创建者）
+     * original_owner_id
+     */
+    @Schema(name = "原始所有者（创建者）")
+    private Long originalOwnerId;
+
+
     @NotBlank(message = "设备类型名称不能为空")
     @Schema(name = "类型名称", required = true)
     private String typeName;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java

@@ -21,7 +21,7 @@ public class DeviceForm {
     private Long assignId;
 
     @Schema(title = "设备类型")
-    private Long deviceTypeId;
+    private Long deviceType;
 
     @Schema(title = "客户号")
     private Long customerId;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.equipment.domain.query;
 
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -15,7 +16,7 @@ import java.util.Set;
  * @Date: 2025/5/16
  **/
 @Data
-public class DeviceQueryCriteria {
+public class DeviceQueryCriteria extends BaseEntity {
 
     @Schema(name = "设备id")
     private Long deviceId;
@@ -24,7 +25,7 @@ public class DeviceQueryCriteria {
     private String deviceName;
 
     @Schema(name = "设备类型")
-    private Long deviceTypeId;
+    private Long deviceType;
 
     @Schema(name = "设备MAC")
     private String deviceMac;
@@ -43,9 +44,6 @@ public class DeviceQueryCriteria {
     @Schema(name = "设备状态  0 失效 1 正常  ")
     private Integer deviceStatus;
 
-    @Schema(name = "创建时间")
-    private List<Timestamp> createTime;
-
     @Schema(name = "页码", example = "1")
     private Integer page = 1;