mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-18 05:25:50 +00:00
🔀 Merged via GitHub API
Dev conflict
This commit is contained in:
commit
561b191fb1
2 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
public class UserService {
|
||||
public String getUserName(int userId) {
|
||||
return "Main: User_" + userId;
|
||||
return "User_" + userId;
|
||||
}
|
||||
|
||||
public boolean isUserActive(int userId) {
|
||||
|
|
Loading…
Reference in a new issue