From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/entity/Area.java |   30 +++++-------------------------
 1 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/moral/entity/Area.java b/src/main/java/com/moral/entity/Area.java
index 1b98b5b..2b9f150 100644
--- a/src/main/java/com/moral/entity/Area.java
+++ b/src/main/java/com/moral/entity/Area.java
@@ -1,36 +1,16 @@
 package com.moral.entity;
 
+import lombok.Data;
 import tk.mybatis.mapper.annotation.ColumnType;
 
-public class Area {
+import javax.persistence.Id;
 
+@Data
+public class Area {
+    @Id
     private Integer areaCode;
 
     private String areaName;
 
     private Integer cityCode;
-
-    public Integer getAreaCode() {
-        return areaCode;
-    }
-
-    public void setAreaCode(Integer areaCode) {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName == null ? null : areaName.trim();
-    }
-
-    public Integer getCityCode() {
-        return cityCode;
-    }
-
-    public void setCityCode(Integer cityCode) {
-        this.cityCode = cityCode;
-    }
 }
\ No newline at end of file

--
Gitblit v1.8.0