package uk.gov.hscic.model.appointment;

import java.util.Date;

public class SlotDetail {
    private Long id;
   // private Long appointmentId;
    private Long typeCode;
    private String typeDisply;
    private Long scheduleReference;
    private String freeBusyType;
    private Date startDateTime;
    private Date endDateTime;
    private Date lastUpdated;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

//    public Long getAppointmentId() {
//        return appointmentId;
//    }
//
//    public void setAppointmentId(Long appointmentId) {
//        this.appointmentId = appointmentId;
//    }

    public Long getTypeCode() {
        return typeCode;
    }

    public void setTypeCode(Long typeCode) {
        this.typeCode = typeCode;
    }

    public String getTypeDisply() {
        return typeDisply;
    }

    public void setTypeDisply(String typeDisply) {
        this.typeDisply = typeDisply;
    }

    public Long getScheduleReference() {
        return scheduleReference;
    }

    public void setScheduleReference(Long scheduleReference) {
        this.scheduleReference = scheduleReference;
    }

    public String getFreeBusyType() {
        return freeBusyType;
    }

    public void setFreeBusyType(String freeBusyType) {
        this.freeBusyType = freeBusyType;
    }

    public Date getStartDateTime() {
        return startDateTime;
    }

    public void setStartDateTime(Date startDateTime) {
        this.startDateTime = startDateTime;
    }

    public Date getEndDateTime() {
        return endDateTime;
    }

    public void setEndDateTime(Date endDateTime) {
        this.endDateTime = endDateTime;
    }

    public Date getLastUpdated() {
        return lastUpdated;
    }

    public void setLastUpdated(Date lastUpdated) {
        this.lastUpdated = lastUpdated;
    }
}

@@ -108,18 +108,16 @@
  id;%0A   
-//
  private
@@ -471,18 +471,16 @@
 %0A    %7D%0A%0A
-//
     publ
@@ -504,26 +504,24 @@
 tmentId() %7B%0A
-//
         retu
@@ -542,21 +542,15 @@
 Id;%0A
-//
     %7D%0A
-//%0A//
+%0A
     
@@ -600,18 +600,16 @@
 ntId) %7B%0A
-//
         
@@ -648,10 +648,8 @@
 Id;%0A
-//
     

Fix merge