合并冲突

This commit is contained in:
caishi 2021-04-19 10:35:20 +08:00
parent 7482d1184c
commit 2677efec83
1 changed files with 1 additions and 1 deletions

View File

@ -78,7 +78,7 @@ function Detail(props){
detail && detail &&
<Cards <Cards
src={`/organize/${detail.name}`} src={`/organize/${detail.name}`}
title={detail.name} title={detail.nickname}
desc={!buttonflag && detail.description} desc={!buttonflag && detail.description}
img={detail.avatar_url} img={detail.avatar_url}
rightBtn={ rightBtn={