Merge remote-tracking branch 'origin/debug' into debug

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -360,7 +360,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 
         RetrievalExcelImDTO retrievalExcelImDTO = new RetrievalExcelImDTO();
         retrievalExcelImDTO.setMessages(messages);
-        return null;
+        return retrievalExcelImDTO;
     }
 
     @SuppressWarnings("deprecation")

knowledgeman-service/src/main/java/com/diagbot/dto/LibraryDetailDTO.java

@@ -57,6 +57,11 @@ public class LibraryDetailDTO {
      */
     private String name;
 
+/**
+     * 概念类型
+     */
+    private String type;
+
     /**
      * 概念类型
      */