Changeset 428c8a4

Timestamp:

02/02/23 15:40:55 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

625a56f

Parents:

d59ae27

Message:

cinema plays film update

File:

• src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java (modified) (3 diffs)

src/main/java/com/example/moviezone/model/manytomany/CinemaPlaysFilm.java

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -15 +12 @@
 @ToString
 @RequiredArgsConstructor
-<<<<<<< Updated upstream
+
 @Table(name = "`cinema_plays_film`")
-=======
-@Table(name = "cinema_plays_film")
->>>>>>> Stashed changes
+
 @IdClass(CinemaPlaysFilmId.class)
 public class CinemaPlaysFilm {
@@ -25 +20 @@
     @Column(name = "id_cinema")
     Integer id_cinema;
-<<<<<<< Updated upstream
-    @Column(name = "id_film")
-    @Id
-=======
+    
+
 
     @Id
     @Column(name = "id_film")
->>>>>>> Stashed changes
     Integer id_film;
 }