Skip to content

Commit 7ebf58b

Browse files
authored
Merge pull request #244 from DevKor-github/main
[Deploy] main to deploy
2 parents 951c346 + d9f7a97 commit 7ebf58b

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

ontime-back/src/main/java/devkor/ontime_back/controller/UserController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ public ResponseEntity<ApiResponseForm<UserInfoResponse>> getUserInfo(HttpServlet
180180
.spareTime(user.getSpareTime())
181181
.note(user.getNote())
182182
.punctualityScore(user.getPunctualityScore())
183+
.socialType(user.getSocialType())
183184
.build();
184185
String message = "사용자 정보 조회 성공";
185186
return ResponseEntity.ok(ApiResponseForm.success(userInfoResponse, message));

ontime-back/src/main/java/devkor/ontime_back/dto/UserInfoResponse.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package devkor.ontime_back.dto;
22

33
import devkor.ontime_back.entity.Role;
4+
import devkor.ontime_back.entity.SocialType;
45
import lombok.AllArgsConstructor;
56
import lombok.Builder;
67
import lombok.Getter;
@@ -18,4 +19,5 @@ public class UserInfoResponse {
1819
public String note;
1920
public Float punctualityScore;
2021
public Role role;
22+
public SocialType socialType;
2123
}

0 commit comments

Comments
 (0)