package br.edu.uniritter.liquid.democracy.model;

import java.io.Serializable;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;

<<<<<<< HEAD
//@Entity
@Table(name = "candidate")
public abstract class Candidate  implements Serializable {

	private static final long serialVersionUID = 1L;
	
	//@Column(name = "number")
	private String name;
=======

@Entity
@Table(name = "candidate")
public abstract class Candidate extends BaseEntity implements Serializable {

	private static final long serialVersionUID = 1L;
	
	@Column(name = "name")
	String name;

>>>>>>> d12b6f7ffe4ef480b23002679731bca770915afa
	
	public String getName() {
		return name;
	}

	public void setName(String name) {
		this.name = name;
	}

}

@@ -176,227 +176,8 @@
 e;%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A//@Entity%0A@Table(name = %22candidate%22)%0Apublic abstract class Candidate  implements Serializable %7B%0A%0A%09private static final long serialVersionUID = 1L;%0A%09%0A%09//@Column(name = %22number%22)%0A%09private String name;%0A=======
 %0A%0A@E
@@ -380,58 +380,8 @@
 ame;
-%0A%0A%3E%3E%3E%3E%3E%3E%3E d12b6f7ffe4ef480b23002679731bca770915afa
 %0A%09%0A%09

Ajuste da Candidate