diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java
index 50c1ae28..b7010dac 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseDeviceType.java
@@ -49,7 +49,7 @@ public class BaseDeviceType extends TenantEntity {
     /**
      * 设备大类ID（大类ID（关联base_category表category_type为2的））
      */
-    private Long categoryId;
+    private Long deviceCategoryId;
 
     /**
      * 激活标识（1是 0否）
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java
index fce67663..fda02444 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseDeviceTypeBo.java
@@ -54,7 +54,7 @@ public class BaseDeviceTypeBo extends BaseEntity {
      * 设备大类ID（大类ID（关联base_category表category_type为2的））
      */
     @NotNull(message = "设备大类不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long categoryId;
+    private Long deviceCategoryId;
 
     /**
      * 激活标识（1是 0否）
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseDeviceTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseDeviceTypeVo.java
index 95d8b227..fd77434d 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseDeviceTypeVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseDeviceTypeVo.java
@@ -63,7 +63,7 @@ public class BaseDeviceTypeVo implements Serializable {
      */
     @ExcelProperty(value = "设备大类ID", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "大=类ID（关联base_category表category_type为2的")
-    private Long categoryId;
+    private Long deviceCategoryId;
 
     /**
      * 激活标识（1是 0否）
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceTypeServiceImpl.java
index 051a1e66..de2f880d 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceTypeServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseDeviceTypeServiceImpl.java
@@ -78,7 +78,7 @@ public class BaseDeviceTypeServiceImpl implements IBaseDeviceTypeService {
         .eq(StringUtils.isNotBlank(bo.getDeviceTypeCode()), BaseDeviceType::getDeviceTypeCode, bo.getDeviceTypeCode())
         .like(StringUtils.isNotBlank(bo.getDeviceTypeName()), BaseDeviceType::getDeviceTypeName, bo.getDeviceTypeName())
         .eq(StringUtils.isNotBlank(bo.getAncestors()), BaseDeviceType::getAncestors, bo.getAncestors())
-        .eq(bo.getCategoryId() != null, BaseDeviceType::getCategoryId, bo.getCategoryId())
+        .eq(bo.getDeviceCategoryId() != null, BaseDeviceType::getDeviceCategoryId, bo.getDeviceCategoryId())
         .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseDeviceType::getActiveFlag, bo.getActiveFlag())
         .orderByDesc(BaseDeviceType::getCreateTime);
         return lqw;