diff --git a/deploy_update.sh b/deploy_update.sh
index 94e95f7..a7c0b46 100644
--- a/deploy_update.sh
+++ b/deploy_update.sh
@@ -15,8 +15,9 @@ echo -e "${BLUE}========================================${NC}"
 
 cd "$PROJECT_ROOT" || { echo -e "${RED}❌ 无法进入项目目录：$PROJECT_ROOT${NC}"; exit 1; }
 
-# 1. Git Pull
+# 1. Git Pull（先重置 lock 文件，避免服务器环境差异导致冲突）
 echo -e "${YELLOW}[1/7] 拉取代码...${NC}"
+git checkout -- composer.lock package-lock.json 2>/dev/null || true
 git fetch origin && git pull origin master
 if [ $? -ne 0 ]; then echo -e "${RED}❌ Git 失败${NC}"; exit 1; fi