Changeset ce32520 for src/main

Timestamp:

02/02/23 15:24:06 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

070cbf5

Parents:

2c60cda (diff), e68190f (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:

• Projection.java (modified) (1 diff)
• Seat.java (added)

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

@@ -27 +27 @@
     @ManyToOne
     Event event;
+    @ManyToOne
+    Discount discount;
 
 }