merge

@@ -54,7 +54,7 @@ pipeline {
                 script {
                 script {
                     def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
                     def PROJECT_WORK_DIR="${env.WORKSPACE}/${params.projectName}"
                     sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
                     sh "git clone -b ${params.projectBranch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${PROJECT_WORK_DIR}"
-                    if(params.isNeedCdn=='YES'){
+                    if(params.isMergeMaster=='YES'){
                         sh "cd ${PROJECT_WORK_DIR} && git merge --no-ff feature/dockerMerge"
                         sh "cd ${PROJECT_WORK_DIR} && git merge --no-ff feature/dockerMerge"
                     }
                     }