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-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/ServiceItemService.java

@@ -195,7 +195,7 @@ public class ServiceItemService extends BaseService {
            array.add(itemDO);
        }
        String response = null;
        String url ="http://localhost:10051/svr-specialist/"/*getBaseUrl()*/ + "importData1";
        String url =/*"http://localhost:10051/svr-specialist/"*/getBaseUrl() + "importData1";
        Map<String,String> params = new HashMap<>();
        params.put("serviceItems",array.toJSONString());
        try {

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

@@ -201,7 +201,7 @@ public class SpecialistHospitalItemService extends BaseService {
            array.add(hospitalServiceItemDO);
        }
        String response = null;
        String url =/*getBaseUrl()*/"http://localhost:10051/svr-specialist/" + "importData2";
        String url =getBaseUrl() + "importData2";
        Map<String,String> params = new HashMap<>();
        params.put("hospitalItems",array.toJSONString());
        try {