Merge pull request 'final' (#10 ) from develop into main

Merge pull request 'zhaoyuyan_zhushi' (#9 ) from branch_zhaoyuyan into develop
Merge pull request 'wuyuxin_zhushi' (#6 ) from develop into main
1 changed files with 1 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -1,8 +1,6 @@
-<<<<<<< HEAD
-# 苍穹外卖

 #### 介绍
-黑马苍穹外卖项目源码，已完结
+外卖项目源码

 #### 软件架构
 软件架构说明
Author	SHA1	Message	Date
m4bagu2fl	b767462b94	Merge pull request 'final' (#10 ) from develop into main	7 months ago
m4bagu2fl	67c0ba3094	Merge pull request 'zhaoyuyan_zhushi' (#9 ) from branch_zhaoyuyan into develop	7 months ago
m4bagu2fl	be5b38751a	Merge pull request 'wuyuxin_zhushi' (#6 ) from develop into main	7 months ago
wdt	8ffac5e359	change readme	7 months ago
m4bagu2fl	c35e8d8a2f	Merge pull request 'second' (#4 ) from develop into main	7 months ago
wdt	866a9adf27	Merge branch 'develop' of https://bdgit.educoder.net/m4bagu2fl/homework init	7 months ago
m4bagu2fl	6d9f0c6a8c	Delete 'README.md'	7 months ago
m4bagu2fl	c1a8d47aa1	Initial commit	7 months ago