Update Jenkinsfile

Jenkinsfile

@@ -6,13 +6,13 @@ pipeline {
     }
 
     stages {
-        
+
         stage('build param') {
             steps {
                 wrap([$class: 'BuildUser']) {
                     script {
                         BUILD_USER = "${env.BUILD_USER}"
-                    }           
+                    }
                 }
                 echo '${BUILD_USER}'
             }
@@ -28,11 +28,7 @@ pipeline {
 
         stage('deploy job') {
             steps {
-<<<<<<< HEAD
-                sshPublisher(publishers: [sshPublisherDesc(configName: 'ECS-CooleShow-47.114.1.200-dev', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'cd /mnt/datadisk/www/cooleshow/h5-colexiu && rm -rf dist/ && tar -zxf *.tar.gz && rm *.tar.gz && systemctl restart nginx', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/datadisk/www/cooleshow/h5-colexiu', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '**/*.tar.gz')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
-=======
                 sshPublisher(publishers: [sshPublisherDesc(configName: 'ECS-CooleShow-47.98.131.38-pre', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: 'cd /mnt/datadisk/www/jenkins/cooleshow/h5-colexiu && rm -rf dist/ && tar -zxf *.tar.gz && rm *.tar.gz', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/mnt/datadisk/www/jenkins/cooleshow/h5-colexiu', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '**/*.tar.gz')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
->>>>>>> online
             }
         }
 
@@ -44,7 +40,7 @@ pipeline {
     }
 
     post {
-        
+
         success {
             dingtalk (
                 robot: "Jenkins",