Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

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

@@ -806,8 +806,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@GetMapping(value = BaseHospitalRequestMapping.Prescription.selectByGuidance)
	@ApiOperation(value = "查询是否有导诊助手", notes = "查询是否有导诊助手")
	public Envelop selectByGuidance()throws Exception{
		doctorInfoService.selectByGuidance();
		return success("操作成功!");
	public MixEnvelop selectByGuidance()throws Exception{
		return MixEnvelop.getSuccessList("查询成功",doctorInfoService.selectByGuidance());
	}
}