记得上下班打卡 | git大法好,push需谨慎

Commit c62899df authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents 9f65ba94 a180a5f7
......@@ -15,6 +15,8 @@ public class SweetManualArtistStageListArDto implements Serializable, Cloneable
@ApiModelProperty("舞台名称")
private String title;
@ApiModelProperty("舞台英文名称")
private String eTitle;
@ApiModelProperty("舞台ID")
private String stageId;
@ApiModelProperty("艺人数据")
......
......@@ -71,6 +71,7 @@ public class RedisArDataUtils {
artist.setResourceUrl(urlList);
}
for (SweetManualArtistStageListArDto stage : stageList) {
stage.setETitle("");
List<SweetManualArtistListArDto> artistListArList = new ArrayList<>();
for (SweetManualArtistListArDto artist : artistList) {
if (artist.getPerformanceStart().contains(time) && stage.getStageId().equals(artist.getStageId())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment