Changeset 59a8941 for Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java

Timestamp:

02/16/23 13:45:55 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

50f2c2a

Parents:

a762b3a (diff), da44aef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge login and register into branch

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java (modified) (2 diffs)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java

@@ -21 +21 @@
 
     @Column(name = "id_organisation")
-    private int organisationId;
+    private Integer organisationId;
 
     @Column(name = "name_shelter", nullable = false, length = 100)
@@ -29 +29 @@
     private String email;
 
-    public Shelter(String address, String telephone, int organisationId, String name, String email) {
+    public Shelter(String address, String telephone, Integer organisationId, String name, String email) {
         this.address = address;
         this.telephone = telephone;