Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/org/petmarket/users/service/UserService.java

src/main/java/org/petmarket/users/service/UserService.java

@@ -32,6 +32,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;