活动与参与记录关联修改

donate-service/src/main/java/com/uas/service/donate/model/Activity.java

@@ -1,6 +1,8 @@
 package com.uas.service.donate.model;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.uas.service.donate.util.CollectionUtils;
 
 import javax.persistence.*;
@@ -191,7 +193,7 @@ public class Activity implements Serializable{
      * 活动所处阶段（前台显示）
      */
     @Transient
-    private Short stage;
+    private String stage;
 
     public Long getId() {
         return id;
@@ -381,6 +383,8 @@ public class Activity implements Serializable{
         this.awardAmount = awardAmount;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
     public Set<ActivityRecode> getActivityRecords() {
         return activityRecords;
     }
@@ -455,7 +459,7 @@ public class Activity implements Serializable{
         return "进行中";
     }
 
-    public void setStage(Short stage) {
+    public void setStage(String stage) {
         this.stage = stage;
     }
 }

donate-service/src/main/java/com/uas/service/donate/model/ActivityRecode.java

@@ -1,8 +1,6 @@
 package com.uas.service.donate.model;
 
 
-import org.hibernate.engine.internal.Cascade;
-
 import javax.persistence.*;
 import java.util.Date;