2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm

Browse Source
This commit is contained in:
小澤　未華
2026-10-20 15:27:39 +09:00
parent ef71711641
commit 0754c4507e
2 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
book-rent/src/main/java/com/example/demo/controller/BookController.java
View File

@@ -1,10 +1,10 @@
package com.example.demo.controller; package com.example.demo.controller;
<<<<<<< HEAD
public class BookController {
=======
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -35,5 +35,5 @@ public class BookController {
model.addAttribute("note", note); model.addAttribute("note", note);
return "bookList"; return "bookList";
} }
>>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
} }

5
book-rent/src/main/resources/templates/bookList.html
View File

@@ -4,7 +4,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍一覧</title> <title>書籍一覧</title>
<<<<<<< HEAD
</head> </head>
<body> <body>
@@ -106,7 +106,7 @@
</script> </script>
=======
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
@@ -166,6 +166,5 @@
</div> </div>
</main> </main>
</body> </body>
>>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
</html> </html>