Merge branch 'develop' of bdgit.educoder.net:mwxbgi697/softegg into develop

# Conflicts: # model/顺序图/账号管理.png
1 year ago · f7cb3048e2
parent a3776d3f47 a22d5754f6
commit f7cb3048e2
6 changed files with 2 additions and 0 deletions
--- a/doc/文档模板：软件设计规格说明书.docx
+++ b/doc/文档模板：软件设计规格说明书.docx
--- a/model/导游状态图.png
+++ b/model/导游状态图.png
--- a/model/游客状态图.png
+++ b/model/游客状态图.png
--- a/model/需求状态图.png
+++ b/model/需求状态图.png
--- a/model/顺序图/desktop.ini
+++ b/model/顺序图/desktop.ini
@ -0,0 +1,2 @@
+[LocalizedFileNames]
+ÐèÇóÆ¥Åä (1).png=@ÐèÇóÆ¥Åä (1),0
--- a/model/顺序图/导游方竞价顺序图.png
+++ b/model/顺序图/导游方竞价顺序图.png