Commit Graph

71 Commits

Author SHA1 Message Date
m-shimizu
e73b98e76d Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 16:27:14 +09:00
m-shimizu
b36bce38e1 FR-09 2026-10-21 16:26:55 +09:00
da41c781df レイアウト変更を行いました 2026-10-21 16:22:56 +09:00
103acf1106 Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:28:51 +09:00
m-shimizu
7d5d038a9e FR-09 2026-10-21 14:27:40 +09:00
6f56164c13 Merge branch 'o-matsuda' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:27:19 +09:00
ce94b90bf1 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/src/main/resources/templates/employeeUpdateConfirm.html
2026-10-21 14:26:59 +09:00
9db673abb8 Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 10:51:51 +09:00
abb1cda6bf employeeupdate.html途中 2026-10-21 10:26:08 +09:00
3e0be17cef Employee Update Confirm 2026-10-21 10:22:00 +09:00
b9036465f2 返却機能 2026-10-21 10:03:06 +09:00
m-shimizu
7362f58c4f Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 10:02:58 +09:00
9728e2a983 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 10:02:29 +09:00
8a0b53522b Employee Controller 2026-10-21 10:02:14 +09:00
fecf19636f Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 09:40:01 +09:00
b298aa01c3 書き出し中一覧に表示 2026-10-21 09:24:53 +09:00
e5f3a3774a お願いします 2026-10-20 16:38:00 +09:00
m-shimizu
9ef18e73ed Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-20 16:31:18 +09:00
a17aa3ae93 Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 16:29:51 +09:00
879d7235e0 10/20 作業分 2026-10-20 16:10:51 +09:00
40c08ea6b4 書籍登録のHTML途中 2026-10-20 16:10:36 +09:00
m-shimizu
45eff1634e FR-09_全体反映なし 2026-10-20 16:10:15 +09:00
m-shimizu
136b18bfc7 FR-01 2026-10-20 16:08:03 +09:00
3d5653418a 05番完了 2026-10-20 16:04:18 +09:00
f87e6d60c9 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 15:33:35 +09:00
0754c4507e mm 2026-10-20 15:27:39 +09:00
ef71711641 s3 2026-10-20 15:24:01 +09:00
6b2c08c031 2 2026-10-20 15:23:08 +09:00
b6d24a3d05 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi 2026-10-20 15:22:43 +09:00
b128e92598 3 stept done 2026-10-20 15:22:39 +09:00
6faaedaa95 コンフリクト解消 2026-10-20 15:22:30 +09:00
1585457395 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa 2026-10-20 15:03:26 +09:00
3e1eb9f6bd AdminloanController done 2026-10-20 14:59:58 +09:00
b6ada277a2 途中 2026-10-20 14:59:26 +09:00
3f304d8e12 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
2026-10-20 14:36:00 +09:00
m-shimizu
9bba174df3 FR-01 2026-10-20 14:26:51 +09:00
3e0f27f7c0 書籍登録コントローラ作成 2026-10-20 14:26:19 +09:00
0566219226 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa 2026-10-20 14:26:13 +09:00
m-shimizu
0bf7852ef9 FR-01 2026-10-20 14:25:38 +09:00
b58a996e84 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi 2026-10-20 14:24:38 +09:00
0b89e45386 途中 2026-10-20 14:24:20 +09:00
a2a406dd8b login done 2026-10-20 14:23:32 +09:00
694cb0f621 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi 2026-10-20 13:45:53 +09:00
ff1c43d80b 途中 2026-10-20 13:45:30 +09:00
m-shimizu
cbb6495741 FR-01 2026-10-20 13:22:30 +09:00
81d722be8d Controller (Login / Loan)
Html (applicatinList /erroe/login)
2026-10-20 13:20:09 +09:00
m-shimizu
c612e9dac3 FR-01_全体反映なし 2026-10-20 13:17:15 +09:00
97e8df70f5 Merge branch 'o-matsuda' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-20 12:51:12 +09:00
bb34fe164e form 2026-10-20 12:47:35 +09:00
cdfdef6d93 htmlファイル 2026-10-20 12:46:26 +09:00