Merge remote-tracking branch 'origin'

rossenzii · rossenzii · commit 771ea64f5b5e · 2026-01-24T15:38:18.000+09:00
diff --git a/src/main/java/backend/stamp/manager/controller/ManagerController.java b/src/main/java/backend/stamp/manager/controller/ManagerController.java
@@ -58,7 +58,7 @@ public ResponseEntity<?> setStamp(
      * @return
      */
     @GetMapping("/settings")
-    public ResponseEntity<?> getSetting(@RequestParam String storeName) {
+    public ResponseEntity<StampSettingResponse> getSetting(@RequestParam String storeName) {
         StampSettingResponse response = managerService.getStamp(storeName);
         return ResponseEntity.ok(response);
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public ResponseEntity<?> setStamp(`
`58`	`58`	`* @return`
`59`	`59`	`*/`
`60`	`60`	`@GetMapping("/settings")`
`61`		`- public ResponseEntity<?> getSetting(@RequestParam String storeName) {`
	`61`	`+ public ResponseEntity<StampSettingResponse> getSetting(@RequestParam String storeName) {`
`62`	`62`	`StampSettingResponse response = managerService.getStamp(storeName);`
`63`	`63`	`return ResponseEntity.ok(response);`
`64`	`64`	`}`