Merge branch 'zx_online_tenantAlbum_0331' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -224,7 +224,7 @@ public class TenantGroupAlbumServiceImpl extends ServiceImpl<TenantGroupAlbumMap
                     item.setExpireTime(userTenantAlbumRecord.getEndTime());
                 }
                 item.setSort(sortMap.getOrDefault(item.getId(),0L));
-                UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord albumRecord = userTenantAlbumRecordService.last(query.getUserId(), item.getTenantGroupAlbumId());
+                UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord albumRecord = userTenantAlbumRecordService.last(query.getUserId(), item.getId());
                 if (albumRecord != null) {
                     item.setEndTime(albumRecord.getEndTime());
                 }