From a3b1e4714ec3d152ab0a5338f4181670b8532557 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 21 Nov 2024 14:21:12 +0800
Subject: [PATCH] update table

---
 .../com/bonus/zlpt/equip/api/domain/TypeInfo.java   |  2 +-
 .../src/main/resources/mapper/MaTypeInfoMapper.xml  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

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"
         <result property="parentId"    column="parent_id"    />
         <result property="typeName"     column="type_name"     />
         <result property="level"   column="level"   />
-        <result property="sort"    column="sort"    />
-        <result property="isActive"      column="is_active"      />
+        <result property="delFlag"      column="del_flag"      />
     </resultMap>
     
     <sql id="bmProjectInfo">
-        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'
     </sql>
 
     <select id="getMaTypeInfoList"  resultType="com.bonus.zlpt.equip.api.domain.TypeInfo">
-        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'
     </select>