diff --git a/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
index d17ed59..fbdae80 100644
--- a/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
+++ b/maibu-common/src/main/java/com/maibu/core/business/IoTCommonDevice.java
@@ -16,25 +16,27 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 除了割草机器人之外的设备 包含其他的物联设备
- *
- * @author rqian
- * @date 2026-3-11
+ * 通用设备表（除割草机器人外的其他物联设备）
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("iot_device_common")
+@TableName(value = "iot_device_common", autoResultMap = true)
 public class IoTCommonDevice extends BaseDO {
-
+    private static final long serialVersionUID = 1L;
 
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-     * 设备ID
+     * 平台设备 ID
      */
     private String deviceId;
 
+    /**
+     * 设备 SN(硬件序列号)
+     */
+    private String sn;
+
     /**
      * 设备名称
      */
@@ -66,10 +68,25 @@ public class IoTCommonDevice extends BaseDO {
     private String networkAddress;
 
     /**
-     * 设备入网IP
+     * 设备入网 IP
      */
     private String networkIp;
 
+    /**
+     * 设备端口
+     */
+    private Integer port;
+
+    /**
+     * 登录账号
+     */
+    private String username;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
     /**
      * 设备经度
      */
@@ -83,23 +100,23 @@ public class IoTCommonDevice extends BaseDO {
     /**
      * 激活时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date activeTime;
 
     /**
-     * 物模型值
+     * 物模型值（非数据库字段）
      */
     @TableField(exist = false)
     private Map<String, Object> properties;
 
     /**
      * 设备备注
-     **/
+     */
     private String remark;
 
     /**
-     * 分组ID，用于分组查询
-     **/
+     * 分组 ID，用于分组查询
+     */
     private Long groupId;
 
     /**
@@ -107,27 +124,45 @@ public class IoTCommonDevice extends BaseDO {
      */
     private Integer isSimulate;
 
+    /**
+     * 连接协议类型
+     */
     private ConnectType connectType;
 
+    /**
+     * 是否已注册（非数据库字段）
+     */
     @TableField(exist = false)
     private Boolean hasRegister;
 
-    private Long orgId; //组织id
-
-    private Long siteId; //场站id
-
-    private Long modelId; //属于某个设备模型
-
+    /**
+     * 组织 ID
+     */
+    private Long orgId;
 
     /**
-     * 产品ID
+     * 场站 ID
+     */
+    private Long siteId;
+
+    /**
+     * 物模型 ID
+     */
+    private Long modelId;
+
+    /**
+     * 产品 ID
      */
     private Long productId;
 
+    /**
+     * 产品名称
+     */
     private String productName;
 
+    /**
+     * 属性列表（非数据库字段）
+     */
     @TableField(exist = false)
     private List<DeviceModelProperty> propertyList;
-
-
 }
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/IotDeviceCommonMapper.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/IotDeviceCommonMapper.java
new file mode 100644
index 0000000..f4700bc
--- /dev/null
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/mapper/IotDeviceCommonMapper.java
@@ -0,0 +1,15 @@
+package com.maibu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.maibu.core.business.IoTCommonDevice;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_common(通用设备表)】的数据库操作Mapper
+ * @createDate 2026-05-09 14:38:50
+ * @Entity abbc.domain.IotDeviceCommon
+ */
+public interface IotDeviceCommonMapper extends BaseMapper<IoTCommonDevice> {
+
+
+}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/IotDeviceCommonService.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/IotDeviceCommonService.java
new file mode 100644
index 0000000..652b4cf
--- /dev/null
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/IotDeviceCommonService.java
@@ -0,0 +1,13 @@
+package com.maibu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.maibu.core.business.IoTCommonDevice;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_common(通用设备表)】的数据库操作Service
+ * @createDate 2026-05-09 14:38:50
+ */
+public interface IotDeviceCommonService extends IService<IoTCommonDevice> {
+
+}
diff --git a/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/IotDeviceCommonServiceImpl.java b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/IotDeviceCommonServiceImpl.java
new file mode 100644
index 0000000..03310c4
--- /dev/null
+++ b/maibu-service/maibu-system-service/src/main/java/com/maibu/service/impl/IotDeviceCommonServiceImpl.java
@@ -0,0 +1,18 @@
+package com.maibu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.maibu.core.business.IoTCommonDevice;
+import com.maibu.mapper.IotDeviceCommonMapper;
+import com.maibu.service.IotDeviceCommonService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author jsmbz
+ * @description 针对表【iot_device_common(通用设备表)】的数据库操作Service实现
+ * @createDate 2026-05-09 14:38:50
+ */
+@Service
+public class IotDeviceCommonServiceImpl extends ServiceImpl<IotDeviceCommonMapper, IoTCommonDevice>
+        implements IotDeviceCommonService {
+
+}
diff --git a/maibu-service/maibu-system-service/src/main/resources/system/IotDeviceCommonMapper.xml b/maibu-service/maibu-system-service/src/main/resources/system/IotDeviceCommonMapper.xml
new file mode 100644
index 0000000..f3db40c
--- /dev/null
+++ b/maibu-service/maibu-system-service/src/main/resources/system/IotDeviceCommonMapper.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.maibu.mapper.IotDeviceCommonMapper">


</mapper>
\ No newline at end of file