Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
# Conflicts: # src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
This commit is contained in:
@@ -111,4 +111,16 @@ public class CollectionElement implements Serializable {
|
||||
this.createDate = createDate;
|
||||
this.projectId = projectId;
|
||||
}
|
||||
public CollectionElement(Long accountId, String level1Type, String level2Type, String level3Type,String name, String url, Byte hasPin, String md5, Date createDate, Long projectId) {
|
||||
this.accountId = accountId;
|
||||
this.level1Type = level1Type;
|
||||
this.level2Type = level2Type;
|
||||
this.level3Type = level3Type;
|
||||
this.name = name;
|
||||
this.url = url;
|
||||
this.hasPin = hasPin;
|
||||
this.md5 = md5;
|
||||
this.createDate = createDate;
|
||||
this.projectId = projectId;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user