From e618df3beaa235aa18309909dda723cf6a9d3204 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 31 May 2024 14:40:11 +0800
Subject: [PATCH] vault backup: 2024-05-31 14:40:11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
Haina/项目/价格平台/价格平台.md
---
 Haina/项目/价格平台/价格平台.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Haina/项目/价格平台/价格平台.md b/Haina/项目/价格平台/价格平台.md
index 7940fc0..c77459a 100644
--- a/Haina/项目/价格平台/价格平台.md
+++ b/Haina/项目/价格平台/价格平台.md
@@ -29,10 +29,13 @@ gitGraph TB:
    commit
    checkout feature/price_manager
    commit
-   commit
+   commit id: "完成价格"
    checkout main
    commit tag: "1.1.0" id: "完成机票"
-   merge feature/price_manager id: "完成价格" tag: "1.2.0"
+   branch pre-release
+   merge feature/price_manager id: "合并机票+价格"
+   checkout main
+   merge pre-release id: "合并发布"  tag: "1.2.0"
    commit
 
 ```