From df23a0aee32839827f3a42e159e21f3abe0b8157 Mon Sep 17 00:00:00 2001
From: Thiago <thiagoo_gl@hotmail.com>
Date: Sun, 24 Nov 2019 09:42:50 -0300
Subject: [PATCH 1/2] =?UTF-8?q?BK-01=20(cria=C3=A7ao=20dos=20packages=20-?=
 =?UTF-8?q?=20entidade=20veiculo)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../park/controller/VeiculoController.java    |  5 ++
 .../com/hackathonfc/park/models/Veiculo.java  | 65 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
 create mode 100644 src/main/java/br/com/hackathonfc/park/models/Veiculo.java

diff --git a/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java b/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
new file mode 100644
index 0000000..05b264c
--- /dev/null
+++ b/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
@@ -0,0 +1,5 @@
+package br.com.hackathonfc.park.controller;
+
+public class VeiculoController {
+
+}
diff --git a/src/main/java/br/com/hackathonfc/park/models/Veiculo.java b/src/main/java/br/com/hackathonfc/park/models/Veiculo.java
new file mode 100644
index 0000000..580f9e8
--- /dev/null
+++ b/src/main/java/br/com/hackathonfc/park/models/Veiculo.java
@@ -0,0 +1,65 @@
+package br.com.hackathonfc.park.models;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="TB_VEICULO")
+public class Veiculo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	private long id;
+	public long getId() {
+		return id;
+	}
+	public void setId(long id) {
+		this.id = id;
+	}
+	public String getMarca() {
+		return marca;
+	}
+	public void setMarca(String marca) {
+		this.marca = marca;
+	}
+	public String getModelo() {
+		return modelo;
+	}
+	public void setModelo(String modelo) {
+		this.modelo = modelo;
+	}
+	public String getCor() {
+		return cor;
+	}
+	public void setCor(String cor) {
+		this.cor = cor;
+	}
+	public String getPlaca() {
+		return placa;
+	}
+	public void setPlaca(String placa) {
+		this.placa = placa;
+	}
+	public String getTipo() {
+		return tipo;
+	}
+	public void setTipo(String tipo) {
+		this.tipo = tipo;
+	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+	private String marca;
+	private String modelo;
+	private String cor;
+	private String placa;
+	private String tipo;
+	
+
+}

From bc379902d7293ff692a67ff934128427831adfab Mon Sep 17 00:00:00 2001
From: Thiago <thiagoo_gl@hotmail.com>
Date: Sun, 24 Nov 2019 10:13:53 -0300
Subject: [PATCH 2/2] Auto stash before merge of "BK-01" and "origin/BK-01"

---
 .../com/hackathonfc/park/controller/VeiculoController.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java b/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
index 05b264c..e69de29 100644
--- a/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
+++ b/src/main/java/br/com/hackathonfc/park/controller/VeiculoController.java
@@ -1,5 +0,0 @@
-package br.com.hackathonfc.park.controller;
-
-public class VeiculoController {
-
-}