From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/SysDictDataMapper.xml | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/SysDictDataMapper.xml b/screen-manage/src/main/resources/mapper/SysDictDataMapper.xml
index f7dd306..a37bc2c 100644
--- a/screen-manage/src/main/resources/mapper/SysDictDataMapper.xml
+++ b/screen-manage/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