diff --git a/src/main/java/org/ntlab/acanthus_server/entities/Account.java b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
index 5ffe796..404301f 100644
--- a/src/main/java/org/ntlab/acanthus_server/entities/Account.java
+++ b/src/main/java/org/ntlab/acanthus_server/entities/Account.java
@@ -23,65 +23,70 @@
 import java.util.UUID;
 
 public class Account {
-    private int uid;
     private String name;
     private String email;
     private String token;
     private String password;
+    private Work work;
 
+    //-----------------------------------------------------------------
     //コンストラクト
     public Account(String name, String email, String password) {
         this.name = name;
         this.email = email;
         this.password = password;
-    }
-
-    //-----------------------------------------------------------------
-    //-----------------------------------------------------------------
-    //uidを返す
-    //GetとSetを実装
-    public int getUid() {
-        return uid;
-    }
-
-    //-----------------------------------------------------------------
-    public void setUid(int uid) {
-        this.uid = uid;
-    }
-
-    //-----------------------------------------------------------------
-    //tokenを返す
-    //GetとSetを実装
-    public String getToken() {
-        return token;
-    }
-
-    //-----------------------------------------------------------------
-    // トークンを生成する
-    public void createToken() {
-        this.token = UUID.randomUUID().toString();
-    }
-
-    //-----------------------------------------------------------------
-    //passwordをtoken認証後返す
-    public String getPassword(String token) {
-        //IFでトークン認証をしたのちに返す
-        return password;
+        this.work = new Work();
     }
     //-----------------------------------------------------------------
-    //emailを返す
-    public String getEmail() {
-        return email;
+    //-----------------------------------------------------------------
+    // setter
+    public void setName(String name) {
+        this.name = name;
     }
     //-----------------------------------------------------------------
     public void setEmail(String email) {
         this.email = email;
     }
     //-----------------------------------------------------------------
+    public void setPassword(String password){
+        this.password = password;
+    }
+    //-----------------------------------------------------------------
+    public void setWork(Work work){
+        this.work = work;
+    }
+    //-----------------------------------------------------------------
+    // getter
+    public String getName(){
+        return (this.name);
+    }
+    //-----------------------------------------------------------------
+    public String getEmail() {
+        return (this.email);
+    }
+    //-----------------------------------------------------------------
+    public String getPassword() {
+        return (this.password);
+    }
+    //-----------------------------------------------------------------
+    public String getToken() {
+        return (this.token);
+    }
+    //-----------------------------------------------------------------
+    public Work getWork() {
+        return (this.work);
+    }
+    //-----------------------------------------------------------------
+    //-----------------------------------------------------------------
+    // トークンを更新する 藤井
+    public void updateToken() {
+        this.token = UUID.randomUUID().toString();
+    }
+    //-----------------------------------------------------------------
     //　パスワードが一致しているかを判定
     public boolean isMatchedPassword(String password) {
         return this.password.equals(password);
     }
-
+    //-----------------------------------------------------------------
 
 }