diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
index ea6ef940..989ffc85 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
@@ -32,7 +32,8 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
     // 获取设备的动作信息
     List<BaseImptabmappingVo> getEquipmentServiceInfo(Long equipmentId);
 
-
     int queryEquipmentByCode(@Param("code")String code);
 
+    SysEquipmentVo queryEquipmentInfoByCode(@Param("code")String code);
+
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 4badc526..bdde52c6 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -83,9 +83,12 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
+        SysEquipmentVo oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
         // 判断设备编码是否存在
         if (sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) {
-            throw new RuntimeException("设备编码已存在");
+            if (!oldSysEquipment.getId().equals(sysEquipmentDto.getId())) {
+                throw new RuntimeException("设备编码已存在");
+            }
         }
         sysEquipment.setUpdatedTime(new Date());
         sysEquipment.setUpdatedBy(sysUserVo.getAccount());
diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index 819d9f30..57ea9fca 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -137,4 +137,8 @@
         select count(1) from sys_equipment where code = #{code}
     </select>
 
+    <select id="queryEquipmentInfoByCode" resultMap="SysEquipmentMap">
+        select * from sys_equipment where code = #{code}
+    </select>
+
 </mapper>
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
index 4f4d4bc4..4d7e2f15 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
@@ -203,7 +203,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量:' : '额定容量:'">
+                            <el-form-item :label="editDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
                                 <el-input-number
                                     style="width: 200px"
                                     :controls="false"
@@ -374,7 +374,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量:' : '额定容量:'">
+                            <el-form-item :label="editAddDeviceData.objectType == '风电场' ? '装机容量(MW):' : '额定容量(MW):'">
                                 <el-input-number
                                     style="width: 200px"
                                     :controls="false"