vault backup: 2024-05-31 14:40:11

Affected files: Haina/项目/价格平台/价格平台.md
1 year ago · e618df3bea
parent 5062e40c2b
commit e618df3bea
1 changed files with 5 additions and 2 deletions
--- 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

 ```