Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/im/ConsultTeamDo.java

@@ -61,7 +61,7 @@ public class ConsultTeamDo extends UuidIdentityEntity {
	
	private String relationCode;//关联业务表的code
	
	private Integer healthindexType;//体征数据上传发送IM消息：1血压 2血糖 3血压+血糖
	private Integer healthindexType;//咨询类型（1、图文；2、视频）
	
	private Integer isRefinement;//是否加精（0未加精 1已加精）
	

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -225,7 +225,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "images",required = false) String images,
			@ApiParam(name = "voice", value = "语音")
			@RequestParam(value = "voice",required = false) String voice,
			@ApiParam(name = "type", value = "咨询类型")
			@ApiParam(name = "type", value = "咨询类型:1专家咨询")
			@RequestParam(value = "type",required = false) Integer type)throws Exception{
		
		System.out.println("symptoms="+symptoms);