Merge branch 'wheng' of wuheng/eas-system into master

Jenkinsfile

@@ -13,9 +13,9 @@ pipeline {
         stage('Build') {
             steps {
                 echo 'Building..'
-                #sh 'docker-compose down'
+                sh 'docker-compose down'
                 sh '~/tools/apache-maven-3.6.3/bin/mvn  clean install -Dmaven.test.skip=true'
-                #sh 'docker build -t ${BRANCH_NAME}:${BUILD_NUMBER} .'
+                sh 'docker build -t ${BRANCH_NAME}:${BUILD_NUMBER} .'
             }
         }
         stage('Test') {