合并冲突

Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8
diff --git a/Dockerfile b/Dockerfile
index 52df866..4feedf9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 COPY package*.json ./
 # 使用淘宝镜像源安装依赖
 RUN npm config set registry https://registry.npmmirror.com && \
-    npm install
+    npm install --legacy-peer-deps
 RUN npm install dva --legacy-peer-deps # 明确安装缺失的dva库
 COPY . .
 RUN npm run build