Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/co/jp/app/common/ApiResponse.java # src/main/java/co/jp/app/controller/UserController.java
2025-05-13 11:40:25 +09:00
parent 71cdb894c0 41931a7f9a
commit 157afecd35
14 changed files with 21 additions and 22 deletions
--- a/target/classes/.gitignore
+++ b/target/classes/.gitignore
@ -0,0 +1,2 @@
+/META-INF/
+/co/
--- a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties
+++ b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties
@ -1,6 +1,6 @@
 #Generated by Maven Integration for Eclipse
-#Mon May 12 14:19:16 JST 2025
-m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1
+#Mon May 12 15:57:02 JST 2025
+m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1
 m2e.projectName=dog-1
 groupId=co.jp.app
 artifactId=dog-2
--- a/target/classes/co/jp/app/common/ApiResponse.class
+++ b/target/classes/co/jp/app/common/ApiResponse.class
--- a/target/classes/co/jp/app/config/security/SecurityConfig.class
+++ b/target/classes/co/jp/app/config/security/SecurityConfig.class
--- a/target/classes/co/jp/app/controller/DownloadController.class
+++ b/target/classes/co/jp/app/controller/DownloadController.class
--- a/target/classes/co/jp/app/controller/UserController.class
+++ b/target/classes/co/jp/app/controller/UserController.class
--- a/target/classes/co/jp/app/controller/uploadController.class
+++ b/target/classes/co/jp/app/controller/uploadController.class
--- a/target/classes/co/jp/app/repository/uploadRepository.class
+++ b/target/classes/co/jp/app/repository/uploadRepository.class
--- a/target/classes/co/jp/app/repository/userRepository.class
+++ b/target/classes/co/jp/app/repository/userRepository.class
--- a/target/classes/co/jp/app/service/userService.class
+++ b/target/classes/co/jp/app/service/userService.class