diff --git a/team1/pom.xml b/team1/pom.xml
index 8a70571..75ae850 100644
--- a/team1/pom.xml
+++ b/team1/pom.xml
@@ -43,7 +43,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webmvc</artifactId>
 		</dependency>
-
+ 
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -75,12 +75,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.example.rhizome</groupId>
-			<artifactId>EM-Spring</artifactId>
+			<groupId>com.example</groupId>
+			<artifactId>HelloSpring</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
-
+ 
 	<build>
 		<plugins>
 			<plugin>
@@ -125,5 +125,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+ 
 </project>
+ 
+ 
\ No newline at end of file
diff --git a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
index 44b99e1..c3589d3 100644
--- a/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
+++ b/team1/src/main/java/com/example/demo/entity/EmployeeEntity.java
@@ -1,5 +1,141 @@
 package com.example.demo.entity;
 
-public class EmployeeEntity {
+import java.security.Timestamp;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+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;
+
+/**
+ * EmployeeテーブルのEntity
+ */
+
+@Entity
+@Table(name = "employee")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class EmployeeEntity {
+	/**
+	 * 社員ID
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id_employee", nullable = false)
+	private Integer idEmployee;
+
+	/**
+	 * 社員名
+	 */
+	@Column(name = "nm_employee", nullable = false, length = 50)
+	private String nmEmployee;
+
+	/**
+	 * 社員よみ
+	 */
+	@Column(name = "kn_employee", nullable = false, length = 100)
+	private String knEmployee;
+
+	/**
+	 * メールアドレス
+	 */
+	@Column(name = "mail_address", nullable = false, length = 256)
+	private String MailAddress;
+
+	/**
+	 * パスワード
+	 */
+	@Column(name = "password", nullable = false, length = 256)
+	private String Password;
+
+	/**
+	 * 管理者フラグ
+	 */
+	@Column(name = "flg_admin", nullable = false)
+	private Character FlgAdmin;
+
+	/**
+	 * 退職者フラグ
+	 */
+	@Column(name = "flg_retirement", nullable = false)
+	private Character FlgRetirement;
+
+	/**
+	 * 更新者
+	 */
+	@Column(name = "id_update", nullable = false)
+	private Integer idUpdate;
+
+	/**
+	 * 更新日
+	 */
+	@Column(name = "date_update", nullable = false)
+	@LastModifiedDate
+	private Timestamp dateUpdate;
 }
+
+//	public static EmployeeEntity convertForm(Employee employee) {
+//		return new EmployeeEntity(
+//				employee.getIdEmployee(),
+//				employee.getnmEmployee(),
+//				employee.getknEmployee(),
+//				employee.getMailAddress(),
+//				employee.getPassword(),
+//				employee.getFlgAdmin(),
+//				employee.getFlgRetirement(),
+//				employee.getIdUpdate(),
+//				employee.getDateUpdate());
+//
+//	}
+//
+//	public static EmployeeEntity convertFrom(SearchConditionEmployee searchConditionEmployee) {
+//		EmployeeEntity employeeEntity = new EmployeeEntity();
+//
+//		employeeEntity.setIdEmployee(searchConditionEmployee.getIdEmployee());
+//		employeeEntity.setNmEmployee(searchConditionEmployee.getNmEmployee());
+//		employeeEntity.setKnEmployee(searchConditionEmployee.getKnEmployee());
+//		employeeEntity.setMailAddress(searchConditionEmployee.getMailAddress());
+//
+//		return employeeEntity;
+//
+//	}
+//
+//	public static Employee createEmployee(EmployeeEntity employeeEntity) {
+//		return new Employee(
+//				employeeEntity.getIdEmployee(),
+//				employeeEntity.getNmEmployee(),
+//				employeeEntity.getKnEmployee(),
+//				employeeEntity.getMailAddress(),
+//				employeeEntity.getPassword(),
+//				employeeEntity.getFlgAdmin(),
+//				employeeEntity.getFlgRetirement(),
+//				employeeEntity.getIdUpdate(),
+//				employeeEntity.getDateUpdate());
+//	}
+//
+//	public static List<Employee> createEmployeeList(List<EmployeeEntity> employeeEntityList) {
+//		return employeeEntityList.stream().map(EmployeeEntity::createEmployee).toList();
+//	}
+//
+//	public LoginUser createLoginUser() {
+//		getIdEmployee(),
+//		getNmEmployee(),
+//		getKnEmployee(),
+//		getMailAddress(),
+//		getPassword(),
+//		getFlgAdmin(),
+//		getFlgRetirement(),
+//		getIdUpdate(),
+//		getDateUpdate());
+//}
+//}