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

# Conflicts:
#	ruoyi-auth/src/main/resources/bootstrap.yml
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/management-platform/src/main/resources/bootstrap.yml

k8s/build.sh

@@ -43,6 +43,7 @@ cd ${baseDir}
 
 # 拉取指定分支的最新代码
 echo "Checking out and pulling branch $branch..."
+git stash
 git checkout $branch
 if [ $? -ne 0 ]; then
     echo "切换到分支 $branch 失败，请检查分支名称是否正确！"