lin pannong

1ec45e91 · linboxuan · 73b80c98 · 1ec45e91
Commit 1ec45e91 authored Nov 06, 2020 by linboxuan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

center-channel/app/base/service/impl/common/signSve.js
+0 -5

No files found.
--- a/center-channel/app/base/service/impl/common/signSve.js
+++ b/center-channel/app/base/service/impl/common/signSve.js
@@ -122,15 +122,11 @@ module.exports = SignService;
 // 	"orderNo":"c76a7c1a0cf747db92e9fc6beab770f0",
 // 	"remark":"lin"
 // }
-<<<<<<< HEAD

 // var obj = {
 // 	"bizId":"202011031421",
 // 	"status":"16"
 // }
 // task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{
-=======
-// task.createSign(obj,"7cbb892450174167b5c7e01we4716t51").then(d=>{
->>>>>>> a8dc991e567d80250a6bc02b620c18da1c7f0fc9
 //     console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
 // });
\ No newline at end of file