Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team1 into a-takayama

team1/src/main/java/com/example/demo/entity/Book_collectionEntity.java

@@ -1,6 +1,6 @@
 package com.example.demo.entity;
  
-import java.sql.Date;
+import java.sql.Timestamp;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,6 +9,8 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
+import org.springframework.data.annotation.LastModifiedDate;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -58,7 +60,8 @@ public class Book_collectionEntity {
 	
 	//更新日
     @Column(name = "date_update", nullable = false)
-    private Date dateUpdate;
+    @LastModifiedDate
+    private Timestamp dateUpdate;
     
 //	public static Book_collection convertFrom(Book_collection book_collection) {
 //    // 値を既に持ったインスタンスの生成に、コンストラクタを使用するとこうなります。

team1/src/main/java/com/example/demo/entity/Borrow_booksEntity.java

@@ -10,6 +10,7 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.Audited.Table;
+import org.springframework.data.annotation.LastModifiedDate;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,6 +21,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+
 public class Borrow_booksEntity {
 
 	/*
@@ -51,11 +53,8 @@ public class Borrow_booksEntity {
 	/*
 	 * ステータス
 	 * */
-	@Column(name = "status", nullable = false)
+	@Column(name = "status", nullable = false, columnDefinition = "default 1")
-	private char 返却済 = 0;
+	private char status;
-	private char 承認待 = 1;
-	private char 貸出中 = 2;
-	private char 却下 = 9;
 
 	/*
 	 * 承認者
@@ -97,5 +96,6 @@ public class Borrow_booksEntity {
 	 * 更新日
 	 * */
 	@Column(name = "date_update", nullable = false)
+	@LastModifiedDate
 	private Timestamp dateUpdate;
 }