From 148c91a61c9ba3ec9cb0e92cabace3f2d2e34fd7 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Thu, 5 Mar 2026 11:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=8B=89=E5=8F=96=E5=89=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=20lock=20=E6=96=87=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=B7=AE=E5=BC=82=E9=80=A0=E6=88=90=E5=90=88=E5=B9=B6=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy_update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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