|
|
|
@@ -13,18 +13,8 @@ |
|
|
|
<result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> |
|
|
|
<result column="nick_name" jdbcType="VARCHAR" property="nickName"/> |
|
|
|
<result column="phone" jdbcType="VARCHAR" property="phone"/> |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
<result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> |
|
|
|
<result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
>>>>>>> [移动塔台登录][修改]:移动塔台登录修改 |
|
|
|
======= |
|
|
|
<result column="with_wechat" jdbcType="INTEGER" property="withWechat"/> |
|
|
|
>>>>>>> [微信第三方登录][修改]:是否绑定微信号 |
|
|
|
======= |
|
|
|
>>>>>>> [微信第三方登录][修改]:账户保护 |
|
|
|
<result column="flow_permission" property="flowPermission"/> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
@@ -33,24 +23,8 @@ |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission` |
|
|
|
======= |
|
|
|
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`bopen_id`,`web_open_id`,`flow_permission` |
|
|
|
>>>>>>> [移动塔台登录][修改]:移动塔台登录修改 |
|
|
|
======= |
|
|
|
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< 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修改 |
|
|
|
======= |
|
|
|
`bopen_id`,`web_open_id` |
|
|
|
>>>>>>> [微信第三方登录][修改]:账户保护 |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
|