merge reset

78721aba · yaobeibei · 45ed63cd · 78721aba
Commit 78721aba authored Jul 23, 2018 by yaobeibei
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

api.js api/api.js +0 -8

No files found.
--- a/api/api.js
+++ b/api/api.js
@@ -1970,13 +1970,6 @@ app.post('/getExportTask', async function (req, res) {
  res.send({ status: 200, datas: dataArr })
 })

-<<<<<<< HEAD
-// 审核Url
-app.post('/checkUrl', async function (req, res) {
-  console.log(req.body)
-  res.send({status: 200, datas: 'ok'})
-})
-=======

 // 审核Url
 app.post('/getUrlData', async function (req, res) {
@@ -2140,5 +2133,4 @@ app.post('/entryIn', function(req, res) {
 })


->>>>>>> reset
 module.exports = app