Merge remote-tracking branch 'origin/feature-wangcz-201814' into feature-wangcz-201814

src/main/java/com/uas/platform/b2c/prod/product/brand/modal/BrandInfo.java

@@ -79,6 +79,18 @@ public class BrandInfo {
 	@Column(name = "br_inital")
 	private String inital;
 
+	/**
+	 * 应用领域
+	 */
+	@Column(name = "br_application")
+	private String application;
+
+	/**
+	 * 品牌简介
+	 */
+	@Column(name = "br_brief", length = 4000)
+	private String brief;
+
 	public Long getId() {
 		return id;
 	}
@@ -159,6 +171,22 @@ public class BrandInfo {
 		this.inital = inital;
 	}
 
+	public String getApplication() {
+		return application;
+	}
+
+	public void setApplication(String application) {
+		this.application = application;
+	}
+
+	public String getBrief() {
+		return brief;
+	}
+
+	public void setBrief(String brief) {
+		this.brief = brief;
+	}
+
 	public BrandInfo() {
 
 	}