Skip to content

Commit 8c93ef0

Browse files
committed
[fix] merge 충돌 해결
1 parent 804735b commit 8c93ef0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ public class ProblemSearchGetResponse {
1717
private String memo;
1818
private String mainProblemImageUrl;
1919
@NotNull(message = "개념 태그리스트는 필수입니다")
20-
private Set<String> getTagName;
20+
private Set<String> tagNames;
2121

2222
public ProblemSearchGetResponse(Long problemId, String problemCustomId, String problemTitle, String memo,
2323
String mainProblemImageUrl,
24-
Set<ConceptTagSearchResponse> getTagName) {
24+
Set<ConceptTagSearchResponse> tagNames) {
2525
this.problemId = problemId;
2626
this.problemCustomId = problemCustomId;
2727
this.problemTitle = problemTitle;
2828
this.memo = memo;
2929
this.mainProblemImageUrl = mainProblemImageUrl;
30-
this.getTagName = getTagName.stream()
30+
this.tagNames = tagNames.stream()
3131
.map(ConceptTagSearchResponse::getName)
3232
.collect(Collectors.toSet());
3333
}

0 commit comments

Comments
 (0)