fgx--

.idea/.gitignore

-# Default ignored files
-/workspace.xml

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/zhichan.iml" filepath="$PROJECT_DIR$/zhichan.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -141,8 +141,6 @@ class DeliverybillCtl extends CtlBase {
     }
     }
   }
   }
 
 
-<<<<<<< HEAD
-=======
   // 创建服务实例
   // 创建服务实例
   async insertInfo(pobj, qobj, req) {
   async insertInfo(pobj, qobj, req) {
     // 检验各项必传参数
     // 检验各项必传参数
@@ -216,12 +214,10 @@ class DeliverybillCtl extends CtlBase {
       return system.getResult(null,err.message)
       return system.getResult(null,err.message)
     }
     }
   }
   }
->>>>>>> 38501ea3c477ef6b2eb192139a5984b9f32df1c6
 }
 }
 module.exports = DeliverybillCtl;
 module.exports = DeliverybillCtl;
 
 
 // var task = new DeliverybillCtl();
 // var task = new DeliverybillCtl();
-<<<<<<< HEAD
 // var obj={
 // var obj={
 //   "deliverId":"1111111"
 //   "deliverId":"1111111"
 // }
 // }
@@ -229,46 +225,15 @@ module.exports = DeliverybillCtl;
 //   console.log(JSON.stringify(d));
 //   console.log(JSON.stringify(d));
 // })
 // })
 
 
-(async () => {
-  var task = new DeliverybillCtl();
-  var obj = {
-    "deliverId":"1111111",
-    "company1": "华为技术有限公司",
-    "company2": "中兴通讯股份有限公司",
-    "keyword1":"用户设备,通信领域,通信技术,设备发送,指示信息,通信系统,通信方法,设备接收,对应关系,基站发送,终端发送,用户体验,配置信息,请求消息,数据传输方法,用户终端,网络侧,移动终端,通信设备,传输方法",
-    "keyword2":"用户体验,移动终端,用户设备,相关技术,网络侧,终端发送,用户终端,配置信息,指示信息,请求消息,对应关系,传输方法,基站发送,通信系统,数据传输方法,通信领域,通信技术,设备发送,响应消息,发送方法"
-  };
-  var d = await task.deliverInfo(obj,{},{})
-  console.log("dddddd---------" + JSON.stringify(d));
-})()
-=======
-// var obj = {
-//   "orderId": "241284456620422",
-//   "source_number": "tx",
-//   "demand_code": "demand_code",
-//   "sku_code": "sku_code",
-//   "solutionBizId": "scheme_number",
-//   "product_code": "bookkeeping",
-//   "product_name": "代账服务",
-//   "service_address": "110100",
-//   "delivery_status": "success",
-//   "facilitator_id": "10",
-//   "facilitator_name": "公司宝",
-//   "source_name": "tencentCloud",
-//   "requestId": "282da0a74432-738f-4bed-b48d-d51aa433",
-//   "bizId": "1292748623",
-//   "contactsPhone": "18510669321",
-//   "userId": "10973452443103156",
-//   "areaType": "city",
-//   "area": "100010",
-//   "topOrgCode": "rong_yi_suan",
-//   "taxpayerType": "generalTaxpayer",
-//   "companyName": "汉唐信通",
-//   "contactName": "王麻子",
-//   "companyBizType": "1",
-//   "uscc": "企业社会统一信用代码"
-// };
-// task.updateServer(obj, {}, {}).then(d => {
-//   console.log(JSON.stringify(d));
-// })
->>>>>>> 38501ea3c477ef6b2eb192139a5984b9f32df1c6
+// (async () => {
+//   var task = new DeliverybillCtl();
+//   var obj = {
+//     "deliverId":"1111111",
+//     "company1": "华为技术有限公司",
+//     "company2": "中兴通讯股份有限公司",
+//     "keyword1":"用户设备,通信领域,通信技术,设备发送,指示信息,通信系统,通信方法,设备接收,对应关系,基站发送,终端发送,用户体验,配置信息,请求消息,数据传输方法,用户终端,网络侧,移动终端,通信设备,传输方法",
+//     "keyword2":"用户体验,移动终端,用户设备,相关技术,网络侧,终端发送,用户终端,配置信息,指示信息,请求消息,对应关系,传输方法,基站发送,通信系统,数据传输方法,通信领域,通信技术,设备发送,响应消息,发送方法"
+//   };
+//   var d = await task.deliverInfo(obj,{},{})
+//   console.log("dddddd---------" + JSON.stringify(d));
+// })()