Merge branch 'feature/1019-tenant' into test

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMapper.xml

@@ -33,7 +33,7 @@
             <if test="param.keyword !=null and param.keyword.trim() !=''">
                 and (t.name_ like concat('%',#{param.keyword},'%')
                 or i.name_ like concat('%',#{param.keyword},'%')
-                or i.brief_Introduction_ like concat('%',#{param.keyword},'%')
+                or t.describe_ like concat('%',#{param.keyword},'%')
                 )
             </if>
             <if test="param.tenantId != null ">