Hans119/Dog-1
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Hans119:f6099d382f826e928d38945abf294fc51fb82f8f
Branches Tags
Hans119:master
..
compare: Hans119:10a51413d0bd078a16c871739bf3d070747c6dee
Branches Tags
Hans119:master

2 Commits
f6099d382f ... 10a51413d0

Author SHA1 Message Date
admin
10a51413d0 Merge remote-tracking branch 'origin/master' 2025-05-12 15:58:55 +09:00
admin
b113c43959 修正版本 2025-05-12 15:58:45 +09:00
1 changed files with 0 additions and 3 deletions
Expand all files Collapse all files

3
src/main/java/co/jp/app/service/UserService.java
View File

@ -12,7 +12,6 @@ import jakarta.transaction.Transactional;
======= =======
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import co.jp.app.dto.RegistrationDto; import co.jp.app.dto.RegistrationDto;
import co.jp.app.entity.UserEntity; import co.jp.app.entity.UserEntity;
@ -27,8 +26,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import co.jp.app.entity.PetEntity;
import co.jp.app.repository.UploadRepository;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
>>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 >>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6