Changeset 89438a3 for src/main/java/com/example/moviezone/model

Timestamp:

02/08/23 11:18:57 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

afa6544

Parents:

93341f8 (diff), 64ee7f4 (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 branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:

src/main/java/com/example/moviezone/model

Files:

• Seat.java (modified) (1 diff)
• procedures/FilmsReturnTable.java (modified) (1 diff)

src/main/java/com/example/moviezone/model/Seat.java

@@ -19 +19 @@
     @ManyToOne
     @JoinColumn(name = "id_room")
-    Projection_Room projection_room;
+    Projection_Room projection;
     @ManyToOne
     @JoinColumn(name = "id_category")

src/main/java/com/example/moviezone/model/procedures/FilmsReturnTable.java

@@ -18 +18 @@
         this.name = name;
     }
+
+    public Integer getId_film() {
+        return id_film;
+    }
+
+    public LocalDate getStart_date() {
+        return start_date;
+    }
+
+    public String getName() {
+        return name;
+    }
 }