Merge remote-tracking branch 'origin/dev5.3.3' into dev5.3.4

src/components/icss/SimilarListDrag.vue

@@ -19,7 +19,7 @@
             <tr v-for="(item,index) in similarList" :key="item.conceptId">
                 <td>{{index+1}}</td>
                 <td>{{item.name}}</td>
-                <td>{{item.isConceptRemark}}</td>
+                <td>({{item.libType}}){{item.isConceptRemark}}</td>
             </tr>
             </table>
         </div>

src/components/medicalTerm/AddAssistCheckMultRelation.vue

@@ -163,7 +163,7 @@ import apis from '@api/medicalTerm.js';
     },
     methods:{
        allowDrop(draggingNode, dropNode, type) {
-        if(draggingNode.data.parentConceptName !== dropNode.data.parentConceptName){
+        if(draggingNode.level !== dropNode.level){
           return false
         }else{
           return type !== 'inner'