继续解决冲突

src/js/request.js

@@ -580,20 +580,20 @@ const projectWorkGet = (data,token) => {
     })
 }
 
-/**
+// /**
- * 得到tag列表
+//  * 得到tag列表
- * @param token
+//  * @param token
- */
+//  */
-const  getTagsProjectList = (token) =>{
+// const getTagsProjectList = (token) =>{
-    return axios({
+//     return axios({
-        url:api+ "/tags/project/list",
+//         url:api+ "/tags/project/list",
-        method: "get",
+//         method: "get",
-        headers:{
+//         headers:{
-            'Authorization':'Bearer '+token,
+//             'Authorization':'Bearer '+token,
-            'Timestamp': getCurrentTimestamp()
+//             'Timestamp': getCurrentTimestamp()
-        }
+//         }
-    })
+//     })
-}
+// }
 
 
 export default {