Merge branch 'feature/0721-tenant'

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -498,7 +498,6 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void quit(String groupId, Long userId, ClientEnum clientType,Boolean quit) throws Exception {
         try {
             imGroupCoreService.groupQuit(userId, clientType.name(), groupId, quit);

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

@@ -823,6 +823,7 @@
                     <foreach collection="param.tenantAlbumIds" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
+                    and tam.del_flag_=0
                 </if>
             </where>
         order by t.top_flag_ desc, t.sort_number_ desc, t.favorite_count_ desc