From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/mapper/GroupMenuMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/GroupMenuMapper.xml b/screen-api/src/main/resources/mapper/GroupMenuMapper.xml
index bdb2457..5930463 100644
--- a/screen-api/src/main/resources/mapper/GroupMenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMenuMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id" />
<result column="group_id" property="groupId" />
<result column="menu_id" property="menuId" />
- <result column="channel" property="channel" />
+ <result column="channel_key" property="channelKey" />
<result column="organization_id" property="organizationId" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
--
Gitblit v1.8.0