d

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -1189,12 +1189,7 @@ module.exports = TrademarktransactionService;
 // a.addbaseinfo([{ "code": "22426244" }, { "code": "31566397" }, { "code": "37222371" }]);
 // a.addbaseinfo([{ "code": "22426244" }, { "code": "31566397" }, { "code": "37222371" }]);
 // a.createjsonfile();
 // a.createjsonfile();
 
 
-<<<<<<< HEAD
 
 
 // (async ()=>{
 // (async ()=>{
   
   
 // })()
 // })()
-=======
-const tc = new TrademarktransactionService()
-tc.consume()
->>>>>>> b600eb4509e728617354a1af84158ca0507498d4

center-tmtransaction/app/base/utils/aliClient.js

@@ -11,11 +11,7 @@ getAliTMClient = () => {
 }
 }
 
 
 //阿里接口
 //阿里接口
-<<<<<<< HEAD
 exports.reqbyget = async (obj,method='GET') => {
 exports.reqbyget = async (obj,method='GET') => {
-=======
-exports.reqbyget = async (obj,rt) => {
->>>>>>> b600eb4509e728617354a1af84158ca0507498d4
     var action = obj.action;
     var action = obj.action;
     var reqbody = obj.reqbody;
     var reqbody = obj.reqbody;
     try {
     try {
@@ -30,15 +26,8 @@ exports.reqbyget = async (obj,rt) => {
             method: method, // set the http method, default is GET
             method: method, // set the http method, default is GET
             headers: {}, // set the http request headers
             headers: {}, // set the http request headers
         });
         });
-<<<<<<< HEAD
-        console.log(JSON.stringify(res))
         return res
         return res
         // console.log(obj.reqbody.tmNumber,"---",obj.reqbody.tmName,"---","成功");
         // console.log(obj.reqbody.tmNumber,"---",obj.reqbody.tmName,"---","成功");
-=======
-        console.log(res);
-        if (rt)
-            return res
->>>>>>> b600eb4509e728617354a1af84158ca0507498d4
     } catch (e) {
     } catch (e) {
         console.log(e);
         console.log(e);
         return e.data.Message
         return e.data.Message