Skip to content

Commit

Permalink
Merge branch 'crud-SocialNetworks' of https://github.com/UdL-EPS-Soft…
Browse files Browse the repository at this point in the history
…Arch/mypets-gei-api into crud-SocialNetworks

# Conflicts:
#	src/main/java/cat/udl/eps/softarch/demo/domain/SocialNetworks.java
  • Loading branch information
xipi3000 committed Mar 5, 2024
2 parents 2b91f1b + c5e55c6 commit 97d2af7
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ public class SocialNetworks extends UriEntity<Long> {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String username;
private String type;
private String url;
private String username;
private String uri;


@ManyToOne
public Shelter belongsTo;


}

0 comments on commit 97d2af7

Please sign in to comment.