release 0.1 #30

Manually merged
noemi3 merged 150 commits from release/0.1 into master 2020-01-18 14:59:02 +00:00
Showing only changes of commit 01e502455f - Show all commits

View File

@ -17,6 +17,14 @@ public class Card {
public Card() { public Card() {
} }
public String getAuthorId() {
return authorId;
}
public void setAuthorId(String authorId) {
this.authorId = authorId;
}
public String getId() { public String getId() {
return id; return id;
} }
@ -217,13 +225,6 @@ public class Card {
isOvertime = overtime; isOvertime = overtime;
} }
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public int getSort() { public int getSort() {
return sort; return sort;
@ -285,7 +286,7 @@ public class Card {
", endAt='" + endAt + '\'' + ", endAt='" + endAt + '\'' +
", spentTime=" + spentTime + ", spentTime=" + spentTime +
", isOvertime=" + isOvertime + ", isOvertime=" + isOvertime +
", userId='" + userId + '\'' + ", userId='" + authorId + '\'' +
", sort=" + sort + ", sort=" + sort +
", subtaskSort=" + subtaskSort + ", subtaskSort=" + subtaskSort +
", type='" + type + '\'' + ", type='" + type + '\'' +
@ -319,10 +320,11 @@ public class Card {
private Date endAt; private Date endAt;
private int spentTime; private int spentTime;
private Boolean isOvertime; private Boolean isOvertime;
private String userId; //private String userId;
private int sort; private int sort;
private int subtaskSort; private int subtaskSort;
private String type; private String type;
private String linkedId; private String linkedId;
@SerializedName(value = "authorId", alternate = "userId")
private String authorId; private String authorId;
} }