Merge remote-tracking branch 'origin/push-dev'

Conflicts:
	graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -56,7 +56,7 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
     private List<BaseNode> baseNodes;
     private String user = "root";
     private String password = "lantone";
-    private String url = "jdbc:mysql://192.168.2.236:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String url = "jdbc:mysql://192.168.2.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
     private Pageable pageable;
     /**
      * 处理症状节点相关的申请