Commit Graph

57 Commits

Author SHA1 Message Date
s-sakiyama
5489761a8b Merge commit '6b7c6d3abf535706c2ffe42bc692da90e2b49bd4' 2026-10-21 14:11:41 +09:00
s-sakiyama
6b7c6d3abf Entityの型、インポートの変更 2026-10-21 14:03:22 +09:00
m-endo
053e33fd0b Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 2026-10-21 11:16:38 +09:00
m-endo
1cf896b986 HTML一部修正、LendingFormクラス作成 2026-10-21 11:14:41 +09:00
s-sakiyama
02eb671aab Serviceの追加 2026-10-21 10:36:30 +09:00
f5b6fcdc40 Confirm系HTML 2026-10-21 09:50:19 +09:00
s-ohasi
f2ec9e2456 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 2026-10-20 16:50:07 +09:00
s-ohasi
2968750da3 no message 2026-10-20 16:49:38 +09:00
m-endo
acd3a5bef6 Merge branch 'm-endo' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 2026-10-20 16:38:09 +09:00
m-endo
b5e96c2695 誤字修正 2026-10-20 16:37:13 +09:00
s-ohasi
89a7d71259 no message 2026-10-20 16:02:55 +09:00
s-sakiyama
5fa2cd6230 Merge branch 'main' into s-sakiyama 2026-10-20 15:56:13 +09:00
1e2b5c6099 Merge remote-tracking branch 'origin/m-endo' 2026-10-20 15:54:53 +09:00
s-sakiyama
3c6971eefd 返却処理用のhtml,Controller作成 2026-10-20 15:54:33 +09:00
m-endo
0895519da3 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into m-endo 2026-10-20 15:54:09 +09:00
m-endo
a6f719d004 HTML3つ作成、コントローダークラス作成途中 2026-10-20 15:53:54 +09:00
9c03505d0f Merge branch 'a-takayama' 2026-10-20 15:51:03 +09:00
f0e6cc165d bookList.html / SelectController / SearchConditionBookForm / SearchBook 途中まで作成 2026-10-20 15:50:17 +09:00
2bdce3b11a no message 2026-10-20 15:46:56 +09:00
8659fa44c2 no message 2026-10-20 15:37:28 +09:00
75fcb36b12 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-ogawa 2026-10-20 15:12:49 +09:00
17831e01bd no message 2026-10-20 15:12:31 +09:00
b6af343b77 no message 2026-10-20 15:00:18 +09:00
7e6bf7c80f 承認待ち書籍のコントローラー 2026-10-20 14:55:16 +09:00
d26d5c7b0b no message 2026-10-20 14:50:31 +09:00
d158c0aa17 Merge branch 'y-ogawa' 2026-10-20 14:48:48 +09:00
3b4ec1f78b 貸出承認確認の途中 2026-10-20 14:48:24 +09:00
s-ohasi
57a499dea3 Merge commit 'e9bc560cfa8d7b9298afe228391e8d28a8cb46d0' 2026-10-20 14:14:03 +09:00
s-ohasi
03c675dd33 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into s-ohasi 2026-10-20 14:06:53 +09:00
s-ohasi
e9bc560cfa ログイン機能でログインHTML、ログインコントローラークラス、ログアウトコントローラークラス、ログインユーザーフォームクラス、エンプロイーレポジトリーのクラスを作成 2026-10-20 14:05:54 +09:00
5ab1abde4d Merge branch 'y-ogawa' 2026-10-20 13:05:07 +09:00
5f206740cc 書籍貸出承認のserviceです 2026-10-20 13:04:52 +09:00
s-ohasi
83ddd7d3d5 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into s-ohasi 2026-10-20 11:01:02 +09:00
00ca28736d Merge branch 'a-takayama' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 2026-10-20 10:24:25 +09:00
s-ohasi
a3aab8ab6b no message 2026-10-20 10:19:40 +09:00
s-ohasi
7871635ffe no message 2026-10-20 09:53:00 +09:00
d119c26b64 Book_collection追加 (length部分) 2026-10-20 09:48:14 +09:00
m-endo
1becc3b196 EmployeeEntity修正版 2026-10-20 09:35:14 +09:00
m-endo
101296640c Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into m-endo 2026-10-19 17:38:12 +09:00
a26978a690 最修正です 2026-10-19 17:22:22 +09:00
580850be5a Merge remote-tracking branch 'origin/a-takayama' 2026-10-19 16:54:56 +09:00
2761953159 Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into a-takayama 2026-10-19 16:53:36 +09:00
37e9cb3be1 Book_collectionEntity途中 2026-10-19 16:53:13 +09:00
b5a4317cba Merge branch 's-ikeda' 2026-10-19 16:53:07 +09:00
d8b29c784b Borrow_BooksEntity修正 2026-10-19 16:52:25 +09:00
m-endo
2659bfae11 EmployeeEntity途中まで 2026-10-19 16:47:33 +09:00
1b26da2ed4 book_collectionとborrow_bookのentity修正です 2026-10-19 16:45:55 +09:00
f5488495bc Merge branch 'a-takayama' 2026-10-19 15:37:17 +09:00
a3f2c47f89 Book_collectionentity 2026-10-19 15:35:57 +09:00
m-endo
65e5ab418d EmployeeEntity途中 2026-10-19 15:35:19 +09:00