Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/icss/AddMedicalRelation.vue

@@ -71,7 +71,7 @@
         data:{
           startName:'',
           startType:'',
-          relationName:'包含',
+          relationName:'包含于',
           endName:'',
           endType:''
         },

src/components/icss/ConceptRelation.vue

@@ -115,7 +115,8 @@ export default {
         },
         modifyRelation(row) {
             const param = {
-              "conceptId": row.conceptId
+              "conceptId": row.conceptId,
+              "relationId":17
             }
             api.getConceptRelationDet(param).then((res) => {
               if(res.data.code=='0'){