Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto

# Conflicts: # src/main/resources/templates/transaction_detail.html
2026-09-28 16:38:26 +09:00 · 2026-09-28 15:28:53 +09:00 · 2026-09-28 14:22:22 +09:00 · 2026-09-28 09:43:26 +09:00 · 2026-09-25 14:23:20 +09:00 · 2026-09-25 14:03:37 +09:00
4 changed files with 57 additions and 59 deletions
--- a/src/main/java/com/example/demo/app/infra/entity/TestController6.java
+++ b/src/main/java/com/example/demo/app/infra/entity/TestController6.java
@@ -1,5 +0,0 @@
-package com.example.demo.app.infra.entity;
-
-public class TestController6 {
-
-}
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -138,6 +138,8 @@

 	    </div>

+
+
 	</div>
 	
 	<div class="card shadow-sm">
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -10,6 +10,7 @@

 <body style="padding-bottom: 120px">
 	<div th:replace="~{header :: header}"></div>
+
 	<h1 class="page-title">コース選択</h1>

 	<th:block th:if="${mode == 'change'}">
Author	SHA1	Message	Date
s-morimoto	acd7534fdb	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto # Conflicts: # src/main/resources/templates/transaction_detail.html	2026-09-28 16:38:26 +09:00
s-morimoto	ee5ec5009d	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-28 15:28:53 +09:00
s-morimoto	7604e9ee76	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-28 14:22:22 +09:00
s-morimoto	26fa2365e8	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto # Conflicts: # src/main/resources/templates/select_course.html	2026-09-28 09:43:26 +09:00
s-morimoto	5adb527d7a	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-25 14:23:20 +09:00
s-morimoto	e54e0133f7	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-25 14:03:37 +09:00
s-morimoto	c3dae348bf	no message	2026-09-25 13:38:58 +09:00
s-morimoto	ea1e18ad93	Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-25 13:35:56 +09:00
s-morimoto	bb3b8965b2	Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto # Conflicts: # src/main/resources/templates/menu.html # src/main/resources/templates/select_course.html # src/main/resources/templates/transaction_detail.html	2026-09-25 13:28:04 +09:00
s-morimoto	3b239d07bd	Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto	2026-09-25 13:17:12 +09:00
s-morimoto	0c54a42b97	Merge branch 'k-oshita' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto # Conflicts: # src/main/resources/templates/menu.html # src/main/resources/templates/transaction_detail.html	2026-09-25 13:14:52 +09:00