Skip to content

Commit 18e2466

Browse files
authored
Merge branch 'main' into 박인규-sprint1
2 parents 03ed421 + fe04f69 commit 18e2466

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

.gitignore

+6-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build/
1515
out/
1616
!**/src/main/**/out/
1717
!**/src/test/**/out/
18-
.idea
18+
1919
### Eclipse ###
2020
.apt_generated
2121
.classpath
@@ -39,4 +39,8 @@ bin/
3939
.vscode/
4040

4141
### Mac OS ###
42-
.DS_Store
42+
43+
.DS_Store
44+
45+
### 형상 관리 예외 ###
46+
.idea

gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Sun Apr 13 14:32:04 KST 2025
1+
#Wed Apr 02 19:19:49 KST 2025
2+
23
distributionBase=GRADLE_USER_HOME
34
distributionPath=wrapper/dists
45
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

src/main/java/com/sprint/mission/discodeit/entity/Channel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ public String toString() {
5454
}
5555
return result;
5656
}
57-
}
57+
}

src/main/java/com/sprint/mission/discodeit/entity/Message.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ public String toString() {
4646
}
4747
return result;
4848
}
49-
}
49+
}

src/main/java/com/sprint/mission/discodeit/entity/User.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.sprint.mission.discodeit.entity;
22

3-
43
import java.text.SimpleDateFormat;
54
import java.util.UUID;
65

@@ -47,4 +46,4 @@ public String toString() {
4746
result = "\n 사용자 이름 : " + name + "\n 생성일 : " + getCreatedAt() + "\n 수정일 : " + getUpdatedAt() + "\n 사용자 UUID : " + id + "\n";
4847
}
4948
return result;
50-
}
49+
}

src/main/java/com/sprint/mission/discodeit/service/UserService.java

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.UUID;
77

88
public interface UserService {
9+
910
User createUser(String name); // 새로운 유저 생성
1011
void updateUserName(User user,String name); // 기존 유저 수정
1112
void printAllUsers();

0 commit comments

Comments
 (0)