Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-02 f14deee7baaf82e7aad6fc81a2509ba88e869afd

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

@@ -6,7 +6,7 @@
        <where>
            t.is_del=0
            <if test="u.id != null and u.id != ''">
                and t.id like concat('%', #{u.id}, '%')
                and t.id = #{u.id}
            </if>
            <if test="u.username != null and u.username != ''">
                and t.username like concat('%', #{u.username}, '%')