解决冲突问题

common/src/main/java/com/jpsoft/employment/modules/base/entity/WishInfo.java

@@ -70,7 +70,7 @@ public class WishInfo {
 	private Integer recordAmount;
 	@ApiModelProperty(value = "心愿列表")
 	private List<StudentAspirations> aspirationList;
-}
+
 
 
 	@Transient

common/src/main/java/com/jpsoft/employment/modules/base/entity/WishInfoUserRecord.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;