Merge remote-tracking branch 'origin/en_info' into en_info

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -245,6 +245,37 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_prodpurc")
 	private Short prodpurc;
 
+	/**
+	 * 行业
+	 */
+	@Column(name = "en_profession")
+	private String profession;
+
+	/**
+	 * 主营业务
+	 */
+	@Column(name = "en_tags")
+	private String tags;
+
+	/**
+	 * 联系人
+	 */
+	@Column(name = "en_contactman")
+	private String contactMan;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "en_contacttel")
+	private String contactTel;
+
+	/**
+	 * 联系人邮箱
+	 */
+	@Column(name = "en_contactemail")
+	private String contactEmail;
+
+
 	public String getEnManagement() {
 		return enManagement;
 	}
@@ -679,4 +710,44 @@ public class Enterprise implements Serializable {
 	public void setBusinesscodeimg(String businesscodeimg) {
 		this.businesscodeimg = businesscodeimg;
 	}
+
+	public String getProfession() {
+		return profession;
+	}
+
+	public void setProfession(String profession) {
+		this.profession = profession;
+	}
+
+	public String getTags() {
+		return tags;
+	}
+
+	public void setTags(String tags) {
+		this.tags = tags;
+	}
+
+	public String getContactMan() {
+		return contactMan;
+	}
+
+	public void setContactMan(String contactMan) {
+		this.contactMan = contactMan;
+	}
+
+	public String getContactTel() {
+		return contactTel;
+	}
+
+	public void setContactTel(String contactTel) {
+		this.contactTel = contactTel;
+	}
+
+	public String getContactEmail() {
+		return contactEmail;
+	}
+
+	public void setContactEmail(String contactEmail) {
+		this.contactEmail = contactEmail;
+	}
 }

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -51,6 +51,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnType(detail.getType());
 		enterprise.setEnUrl(detail.getUrl());
 		enterprise.setLogUrl(detail.getLogoImage());
+		enterprise.setProfession(detail.getProfession());
+		enterprise.setTags(detail.getTags());
+		enterprise.setContactMan(detail.getContactMan());
+		enterprise.setContactTel(detail.getContactTel());
+		enterprise.setContactEmail(detail.getContactEmail());
 		enterprise = enterpriseDao.save(enterprise);
 
 		if (isNew) {