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

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

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1667,7 +1667,9 @@ public class ImService {
				if (org.apache.commons.lang3.StringUtils.isNoneBlank(bannerList)){
					String str[]=bannerList.split(",");
					for (int i=0;i<bannerList.length();i++){
						BaseBannerDoctorDO
						BaseBannerDoctorDO bannerDoctorDO = new BaseBannerDoctorDO();
						bannerDoctorDO.setCreateTime(new Date());
						bannerDoctorDO.setUpdateTime(new Date());
					}
				}
			}