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修改