Merge remote-tracking branch 'origin/Schedule-scenarios' into Schedul…

…e-scenarios # Conflicts: # src/main/java/cat/udl/eps/softarch/demo/domain/Schedule.java
UdL-EPS-SoftArch · Apr 4, 2024 · ce12c36 · ce12c36
2 parents 6f650fb + e6ed2f7
commit ce12c36
Showing 1 changed file with 7 additions and 3 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
@@ -7,7 +7,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.ZonedDateTime;
+import java.sql.Time;
 
 @Entity
 @Data
@@ -16,13 +16,17 @@ public class Schedule {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
+<<<<<<<<< Temporary merge branch 1
+    private int Id;
+=========
     private long Id;
+>>>>>>>>> Temporary merge branch 2
 
     @NotNull
-    private ZonedDateTime startTime;
+    private String startTime;
 
     @NotNull
-    private ZonedDateTime endTime;
+    private String endTime;
 
     @ManyToOne
     //@NotNull