Merge remote-tracking branch 'origin/dev-czh' into dev

k8s/build.sh

@@ -50,12 +50,14 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+git stash
 git pull origin $branch
 if [ $? -ne 0 ]; then
     echo "拉取代码失败，请检查网络或联系管理员！"
     exit 1
 fi
 
+chmod +777 *.sh
 # 创建目录
 mkdir -p ${baseDir}/k8s/dockerfiles/jar
 mkdir -p ${baseDir}/k8s/dockerfiles/html