diff --git a/doc/修改意见-一轮.docx b/doc/修改意见-一轮.docx
new file mode 100644
index 0000000..a7c3cac
Binary files /dev/null and b/doc/修改意见-一轮.docx differ
diff --git a/model/新建文本文档.txt b/model/新建文本文档.txt
index 562890b..42359a0 100644
--- a/model/新建文本文档.txt
+++ b/model/新建文本文档.txt
@@ -1 +1,5 @@
-d1
\ No newline at end of file
+<<<<<<< HEAD
+d1
+=======
+fhktddjhfk
+>>>>>>> wsy_branch
diff --git a/model/用户主要界面流顺序图.png b/model/用户主要界面流顺序图.png
new file mode 100644
index 0000000..8ab9154
Binary files /dev/null and b/model/用户主要界面流顺序图.png differ