Merge branch 'termLink0615' into test

# Conflicts:
#	src/api/cdss.js

src/api/cdss.js

@@ -714,4 +714,16 @@ export default {
   updateRunningStatus(param) {
     return axios.post(urls.updateRunningStatus, param);
   },
+<<<<<<< HEAD
+=======
+
+  getRelatedMapping(param) {
+    //查询已映射关系
+    return axios.post(urls.getRelatedMapping, param);
+  },
+  getTermMatching(param) {
+    //推荐匹配
+    return axios.post(urls.getTermMatching, param);
+  },
+>>>>>>> termLink0615
 };