Merge branch 'master' into 'mlbWork'

Master

See merge request !26

Jenkinsfile

@@ -8,12 +8,12 @@ pipeline {
             }
             post {
                 success {
-                    sh "/usr/local/bin/workwechatctl -p ${env.JOB_NAME} -n 张志伟 -c 项目编译成功进行下一阶段"
+                    sh "/usr/local/bin/workwechatctl -p ${env.JOB_NAME} -n 马黎滨 -c 项目编译成功进行下一阶段"
                 }
                 failure {
                     step([$class: 'Mailer',
                     notifyEveryUnstableBuild: true,
-                    recipients: "zhangzhiwei@zhiweidata.com",
+                    recipients: "malibin@zhiweidata.com",
                     sendToIndividuals: true])
                 }
             }