冲突解决

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -590,13 +590,8 @@ class TxHandler {
       }
 
     }
-<<<<<<< HEAD
     return system.rysQueueOper(obj);
-    
-=======
-    return systetm.rysQueueOper(obj);
 
->>>>>>> 7836d50cb415f70a29da5fdfc628da6d8971e68c
   }
 
   // 融易算服务状态变更通知
@@ -673,7 +668,7 @@ class TxHandler {
     return system.rysQueueOper(obj);
   }
 
-  async test(datajson){
+  async test(datajson) {
     var rc = system.getObject("util.execClient");
     var reqUrl = this.bookUrl + "/bizOptCtl/insertInfo";
     var result = await rc.execPost3(datajson, reqUrl);