From b30017d1e3235fb3bfd85e6b46c31af0d8f2d531 Mon Sep 17 00:00:00 2001 From: liuxiaohua Date: Wed, 2 Jul 2025 18:51:59 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20[2025-06-30]=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=8C=E6=AD=A5=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20250627-Git分支管理规范(修订版).md | 11 ++++++----- 材料/承运商映射.xlsx | Bin 12109 -> 12235 bytes 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/文档/基础组件/20250627-Git分支管理规范(修订版).md b/文档/基础组件/20250627-Git分支管理规范(修订版).md index c50b7d4..e93986b 100644 --- a/文档/基础组件/20250627-Git分支管理规范(修订版).md +++ b/文档/基础组件/20250627-Git分支管理规范(修订版).md @@ -96,11 +96,12 @@ ### 6. 环境部署分支 -| 分支类型 | 分支名 | 环境 | 更新来源 | 自动部署规则 | -|-------|---------|-------|------------------|--------------| -| 开发环境 | develop | 开发环境 | develop/xxx 合并 | 每次 push 自动部署 | -| 测试环境 | test | 测试环境 | develop/xxx 分支合并 | 每次 push 自动部署 | -| UAT环境 | uat | UAT环境 | release/xxx 合并 | 手动触发部署 | +| 分支类型 | 分支名 | 环境 | 更新来源 | 自动部署规则 | +|-------|---------|-------|-----------------------------|--------------| +| 开发环境 | develop | 开发环境 | develop/xxx 合并 | 每次 push 自动部署 | +| 测试环境 | test | 测试环境 | develop/xxx 分支合并 | 每次 push 自动部署 | +| UAT环境 | uat | UAT环境 | release/xxx 合并 | 手动触发部署 | +| 生产环境 | master | 生产环境 | release/xxx 或 hotfix/xxx 合并 | 手动触发部署 | ## 工作流程详解 diff --git a/材料/承运商映射.xlsx b/材料/承运商映射.xlsx index 7b6a5cbed4397fe315ff55ebba57522dee5df92e..6c3a2f01ea7ae1784592428d1e6eb573e4e71a10 100644 GIT binary patch delta 5558 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 delta 5421 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 TZFnV7G~k82%$P*n|B?M48mu8i