Skip to content

Commit f86c4a0

Browse files
authored
Merge pull request #224 from ASSU-org/develop
Deploy
2 parents c6ab5db + cce76ee commit f86c4a0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/main/java/com/assu/server/domain/user/dto/StudentResponseDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public static class UsablePartnershipDTO {
8181
private Integer people;
8282
private Long cost;
8383
private String note;
84+
private Long paperId;
8485
private String category;
8586
private Long discountRate;
8687
}

src/main/java/com/assu/server/domain/user/service/StudentServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public List<StudentResponseDTO.UsablePartnershipDTO> getUsablePartnership(Long m
163163
.partnershipId(paper.getId())
164164
.adminName(adminName)
165165
.partnerName(partnerName)
166-
.note(note)
166+
.note(note).paperId(content != null? content.getPaper().getId(): null)
167167
.criterionType(content != null ? content.getCriterionType() : null)
168168
.optionType(content != null ? content.getOptionType() : null)
169169
.people(content != null ? content.getPeople() : null)

0 commit comments

Comments
 (0)