Merge remote-tracking branch 'origin/master'

src/main/java/co/jp/app/service/UserService.java

@@ -1,5 +1,15 @@
 package co.jp.app.service;
 
+<<<<<<< HEAD
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import co.jp.app.entity.UserEntity;
+import co.jp.app.repository.userRepository;
+import jakarta.transaction.Transactional;
+
+=======
 import java.util.Collection;
 import java.util.Collections;
 
@@ -17,16 +27,28 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
+>>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6
 
 @Service
 public class UserService implements UserDetailsService {
 
+<<<<<<< HEAD
+	private final userRepository userEntityRepository;
+
+	@Autowired
+	public UserService(userRepository userEntityRepository, PasswordEncoder passwordEncoder )
+	{
+		this.userEntityRepository = userEntityRepository;
+		this.passwordEncoder= passwordEncoder;
+		
+=======
 	private final UserRepository userRepository;
 	private final PasswordEncoder passwordEncoder;
 
 	public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) {
 		this.userRepository = userRepository;
 		this.passwordEncoder = passwordEncoder;
+>>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6
 	}
 
 	@Transactional