Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -1003,7 +1003,7 @@ public class MessageService extends BaseService {
            int result = 0;
            Message message = messageDao.findOne(id);
            String response = null;
            String url =/*specialistUrl*/"http://localhost:10051/" + "svr-specialist/selectByIds";
            String url =specialistUrl + "svr-specialist/selectByIds";
            Map<String,String> params = new HashMap<>();
            params.put("ids",message.getRelationCode());
            try {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistEvaluateSevice.java

@@ -120,7 +120,7 @@ public class SpecialistEvaluateSevice extends BaseService {
     */
    public JSONObject selectByDoctor(String doctor){
        String response = null;
        String url ="http://localhost:10051/" + "svr-specialist/selectByDoctor";
        String url =/*"http://localhost:10051/"*/specialistUrl + "svr-specialist/selectByDoctor";
        Map<String,String> params = new HashMap<>();
        params.put("doctor",doctor);
        try {