Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/codesdream/ase/model/permission/User.java

src/main/java/com/codesdream/ase/model/activity/UserActivity.java

@@ -0,0 +1,55 @@
+package com.codesdream.ase.model.activity;
+
+import com.codesdream.ase.model.permission.User;
+import javafx.scene.chart.ScatterChart;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@Entity
+@Table(name = "user_act")
+public class UserActivity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    //关联的用户
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "userActivity")
+    @JoinColumn(nullable = false)
+    private User user;
+
+    //主要负责的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> manageActivities;
+
+    //次要负责的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> assistActivities;
+
+    //可见的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> visibleActivities;
+
+    //创建的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> createdActivities;
+
+    //可报名的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> signUpActivities;
+
+    //已经参与的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> participatedActivities;
+
+    //正在（将要）参与的活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> participatingActivities;
+
+    //打卡签到活动
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Activity> clockIn;
+}

src/main/java/com/codesdream/ase/model/permission/User.java

@@ -1,6 +1,7 @@
 package com.codesdream.ase.model.permission;
 
 import com.codesdream.ase.component.UserRolesListGenerator;
+import com.codesdream.ase.model.activity.UserActivity;
 import com.codesdream.ase.service.UserService;
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
@@ -56,6 +57,9 @@ public class User implements UserDetails {
     @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private UserDetail userDetail;
 
+    @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private UserActivity userActivity;
+
     // 用户认证表
     @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private UserAuth userAuth;