diff --git a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java
index 4c796d4..0f7f7b2 100644
--- a/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java
+++ b/zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/TypeInfo.java
@@ -56,7 +56,7 @@ public class TypeInfo extends BaseEntity
/** 是否删除 */
@Excel(name = "是否删除")
@ApiModelProperty(value = "是否删除", required = true)
- private String isActive;
+ private String delFlag;
/** 父部门名称 */
@ApiModelProperty(value = "父部门名称", required = true)
diff --git a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
index eaf8333..2bb169d 100644
--- a/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
+++ b/zlpt-modules/zlpt-home/src/main/resources/mapper/MaTypeInfoMapper.xml
@@ -10,18 +10,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
+
- select type_id, parent_id, type_name, `level`, sort, is_active
- from ma_type_info
+ select type_id, parent_id, type_name, `level`, del_flag
+ from ma_type
+ where del_flag = '0'