merge fixes

UdL-EPS-SoftArch · Apr 4, 2024 · dfb064c · dfb064c
1 parent ce12c36
commit dfb064c
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java b/src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java
@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.sql.Time;
+import java.time.ZonedDateTime;
 
 @Entity
 @Data
@@ -16,17 +17,13 @@ public class Schedule {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-<<<<<<<<< Temporary merge branch 1
-    private int Id;
-=========
     private long Id;
->>>>>>>>> Temporary merge branch 2
 
     @NotNull
-    private String startTime;
+    private ZonedDateTime startTime;
 
     @NotNull
-    private String endTime;
+    private ZonedDateTime endTime;
 
     @ManyToOne
     //@NotNull