Commit Graph

85 Commits

Author SHA1 Message Date
0682e588a7 html完成 2026-10-23 09:53:44 +09:00
adae4c5de5 Merge branch 'service' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into a-takayama
# Conflicts:
#	team1/pom.xml
#	team1/src/main/java/com/example/demo/repository/Book_CollectionRepository.java
2026-10-22 13:07:53 +09:00
1b73b9329f 作業途中html 2026-10-22 13:02:35 +09:00
s-sakiyama
773284fd04 貸出可能な書籍一覧 2026-10-22 13:01:31 +09:00
s-ohasi
8124e8633c Merge branch 's-ohasi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 2026-10-22 12:40:06 +09:00
s-ohasi
09f451e7f6 no message 2026-10-22 12:39:38 +09:00
s-sakiyama
a80e99da7f serviceクラスに貸し出しの承認却下を追加 2026-10-22 11:17:28 +09:00
384154436f 作業途中 2026-10-22 10:53:14 +09:00
s-sakiyama
40733ad01f Merge commit '3576a7613759dfb052516b073c567c2c3359f8d4' 2026-10-22 09:13:48 +09:00
s-sakiyama
3576a76137 返却の更新部分をserviceに追加 2026-10-21 15:36:24 +09:00
2d4ec7f061 SelectBookController・Book_CollectionRepository途中まで 2026-10-21 15:22:06 +09:00
a58ccda9c8 pom.xmlの修正 2026-10-21 14:52:06 +09:00
s-sakiyama
5489761a8b Merge commit '6b7c6d3abf535706c2ffe42bc692da90e2b49bd4' 2026-10-21 14:11:41 +09:00
s-sakiyama
53fd6ae2db serviceの作成及び仕様 2026-10-21 14:10:37 +09:00
s-sakiyama
6b7c6d3abf Entityの型、インポートの変更 2026-10-21 14:03:22 +09:00
s-ohasi
7239374b40 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-21 12:29:01 +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
a4a675d68e SelectBookController処理の追加 2026-10-21 10:51:12 +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
caa47d310a no message 2026-10-21 09:17:35 +09:00
s-ohasi
b2dc911b67 login.html 2026-10-21 09:14:46 +09:00
56da7392b9 Merge remote-tracking branch 'origin/s-ikeda' into a-takayama 2026-10-21 09:12:27 +09:00
ab57ed4ec8 Merge remote-tracking branch 'origin/y-ogawa' into a-takayama 2026-10-21 09:11:07 +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
ba81a9b50f HTML追加 2026-10-20 16:49:09 +09:00
0af33fb0c0 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-20 16:38:17 +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
c730538e56 Merge remote-tracking branch 'origin/y-nakano' into a-takayama 2026-10-20 16:35:57 +09:00
s-ohasi
89a7d71259 no message 2026-10-20 16:02:55 +09:00
4fb0f51dc4 機能6のHTML(途中) 2026-10-20 15:56:59 +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
c5142cdfdf Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into y-nakano 2026-10-20 15:50:07 +09:00
53485523b0 no message 2026-10-20 15:49:25 +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