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

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/IndustryApplicationInfo.java

@@ -50,6 +50,13 @@ public class IndustryApplicationInfo implements Serializable {
 	@ApiModelProperty(value = "详情图")
 	private String detailImg;
 
+	/**
+	 * 详细描述
+	 */
+	@Column(name = "intro")
+	@ApiModelProperty(value = "简介")
+	private String intro;
+
 	/**
 	 * 详细描述
 	 */