From 4315f9b96104b81ccd10907b4f53418f7e489703 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 1 Mar 2019 13:53:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:with=5Fchat=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MallUserInfoMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index df51f8afe..ea91f3f3d 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -27,7 +27,7 @@ `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, - isnull(`web_open_id`) has_wechat + isnull(`web_open_id`) with_wechat @@ -39,8 +39,12 @@ >>>>>>> [移动塔台登录][修改]:移动塔台登录修改 ======= `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, +<<<<<<< HEAD `bopen_id`,`web_open_id`,isnull(`web_open_id`) has_wechat >>>>>>> [微信第三方登录][修改]:是否绑定微信号 +======= + `bopen_id`,`web_open_id`,isnull(`web_open_id`) with_wechat +>>>>>>> [微信第三方登录][修改]:with_chat修改