10 Commits

Author SHA1 Message Date
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
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
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
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
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
c3dae348bf no message 2026-09-25 13:38:58 +09:00
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
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
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
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
4 changed files with 3 additions and 6 deletions

View File

@@ -1,5 +0,0 @@
package com.example.demo.app.infra.entity;
public class TestController6 {
}

View File

@@ -138,6 +138,8 @@
</div> </div>
</div> </div>
<div class="card shadow-sm"> <div class="card shadow-sm">

View File

@@ -10,6 +10,7 @@
<body> <body>
<div th:replace="~{header :: header}"></div> <div th:replace="~{header :: header}"></div>
<h1 class="page-title">コース選択</h1> <h1 class="page-title">コース選択</h1>
<th:block th:if="${mode == 'change'}"> <th:block th:if="${mode == 'change'}">

View File

@@ -105,7 +105,6 @@
</div> </div>
<form th:action="@{/transaction/create}" method="get"> <form th:action="@{/transaction/create}" method="get">
<input type="hidden" name="today" id="today" th:value="${today}"> <input type="hidden" name="today" id="today" th:value="${today}">
<button type="submit">新規登録</button> <button type="submit">新規登録</button>