Merge branch 'xjjdev'
This commit is contained in:
commit
a186312aa3
@ -135,6 +135,8 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{
|
var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{
|
||||||
|
ArtistUuid: v.ArtistUid,
|
||||||
|
ArtworkUid: v.ArtworkUid,
|
||||||
LockStatus: int32(v.Status),
|
LockStatus: int32(v.Status),
|
||||||
BaseAuditStatus: v.BaseAuditStatus,
|
BaseAuditStatus: v.BaseAuditStatus,
|
||||||
BaseAuditMark: v.BaseAuditMark,
|
BaseAuditMark: v.BaseAuditMark,
|
||||||
@ -149,7 +151,6 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
|
|||||||
}
|
}
|
||||||
for _, artwork := range previewListRes.Data {
|
for _, artwork := range previewListRes.Data {
|
||||||
if artwork.ArtworkUid == v.ArtworkUid {
|
if artwork.ArtworkUid == v.ArtworkUid {
|
||||||
thisArtwork.ArtistUuid = artwork.ArtistUuid
|
|
||||||
thisArtwork.ArtworkName = artwork.ArtworkName
|
thisArtwork.ArtworkName = artwork.ArtworkName
|
||||||
thisArtwork.Length = artwork.Length
|
thisArtwork.Length = artwork.Length
|
||||||
thisArtwork.Width = artwork.Width
|
thisArtwork.Width = artwork.Width
|
||||||
|
Loading…
Reference in New Issue
Block a user