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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

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

@@ -2283,7 +2283,7 @@ public class ImService {
						content.append(consultAdvice.getAdviceValue()+",");
					}
					if (content!=null){
						content.delete(content.length()-1,content.length());
						content.deleteCharAt(content.length()-1);
					}
					map.put("icd10Name",content);
				}