From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-api/src/main/resources/mapper/SysDictDataMapper.xml |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/SysDictDataMapper.xml b/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
index f7dd306..a37bc2c 100644
--- a/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
+++ b/screen-api/src/main/resources/mapper/SysDictDataMapper.xml
@@ -5,11 +5,9 @@
         <!-- ������������������������ -->
         <resultMap id="BaseResultMap" type="com.moral.api.entity.SysDictData">
                     <id column="id" property="id" />
-                    <result column="parent_id" property="parentId" />
                     <result column="dict_type_id" property="dictTypeId" />
                     <result column="dataKey" property="dataKey" />
                     <result column="dataValue" property="dataValue" />
-                    <result column="sort" property="sort" />
                     <result column="create_time" property="createTime" />
                     <result column="update_time" property="updateTime" />
                     <result column="is_delete" property="isDelete" />

--
Gitblit v1.8.0