Merge branch 'baseEntity' into contactIsolate

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/entity/Contact.java

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/contact/ContactController.java

@@ -80,7 +80,7 @@ public class ContactController {
                     contact.setUserId(userId);
                     contact.setBizType(contactSaveDto.getBizType());
                     contact.setCreatedAt(now);
-                    contact.setUpdateAt(now);
+                    contact.setUpdatedAt(now);
                 });
         if (contacts.isEmpty()) {
             return JsonResult.buildErrorStateResult("数据格式错误", null);

src/main/java/cn/quantgroup/xyqb/entity/Contact.java

@@ -11,12 +11,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.sql.Timestamp;
 
 /**
  * Created by 11 on 2016/12/30.