Merge branch 'dev'

zhaoxiaohao

2020-09-18 daa697719eb0ddfd170f1ab94c5422a4f5b93951

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -36,6 +36,9 @@
    </sql>
    <sql id="where_map">
        <where>
            <if test="u.isDel != null">
                and t.is_del = #{u.isDel}
            </if>
            <if test="u.id != null and u.id != ''">
                and t.id like concat('%', #{u.id}, '%')
            </if>