Merge remote-tracking branch 'origin/master'

src/main/java/com/codesdream/ase/model/parent/Excercise.java

@@ -0,0 +1,28 @@
+package com.codesdream.ase.model.parent;
+
+import com.codesdream.ase.model.file.Image;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Time;
+import java.util.Date;
+import java.util.List;
+
+@Entity
+@Table
+@Data
+public class Excercise {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    int id;
+
+    // 开始时间
+    Date start;
+
+    // 持续时间
+    Time duration;
+
+    // 学期
+    int term;
+}

src/main/java/com/codesdream/ase/model/parent/Message.java

@@ -0,0 +1,30 @@
+package com.codesdream.ase.model.parent;
+
+import com.codesdream.ase.model.file.File;
+import com.codesdream.ase.model.mark.Tag;
+import com.codesdream.ase.model.permission.User;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Entity
+@Table
+@Data
+public class Message {
+    @Id
+    int id;
+
+    String title;
+    String text;
+    Boolean have_read;
+
+    // 重要性  值为0-1
+    int type;
+
+    @OneToMany
+    User Receiver;
+
+}

src/main/java/com/codesdream/ase/model/parent/Parent.java

@@ -0,0 +1,23 @@
+package com.codesdream.ase.model.parent;
+
+import com.codesdream.ase.model.mark.Tag;
+import com.codesdream.ase.model.permission.User;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.annotation.Generated;
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Parent extends User {
+    @Column(nullable = false)
+    String parentId;
+
+    @Column(nullable = false)
+    String name;
+
+}

src/main/java/com/codesdream/ase/model/robot/Faq.java

@@ -0,0 +1,20 @@
+package com.codesdream.ase.model.robot;
+
+import com.codesdream.ase.model.mark.Tag;
+import com.codesdream.ase.model.permission.User;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.annotation.Generated;
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table
+@Data
+public class Faq {
+    String answer;
+    String question;
+    List<String> tag;
+
+}

src/main/java/com/codesdream/ase/model/student/Student.java

@@ -19,4 +19,8 @@ public class Student extends User {
 
     String profilePicture;
 
+    @Column(nullable = false)
+    Boolean is_showgrade;
+
+
 }

src/main/java/com/codesdream/ase/model/student/StudentCourse.java

@@ -22,6 +22,8 @@ public class StudentCourse {
     @Column(nullable = false)
     boolean isFailed;
 
+    int term;
+
     Date finishedDate;
 
 }