diff --git a/doc/Git实践笔记.txt b/doc/Git实践笔记.txt
new file mode 100644
index 0000000..88a3ddb
--- /dev/null
+++ b/doc/Git实践笔记.txt
@@ -0,0 +1 @@
+郑汐蕾_branch 分支：修改第一行内容，制造冲突
\ No newline at end of file
diff --git a/doc/文档模板-软件需求规格说明书模板.docx b/doc/文档模板-软件需求规格说明书模板.docx
new file mode 100644
index 0000000..51db8db
Binary files /dev/null and b/doc/文档模板-软件需求规格说明书模板.docx differ
diff --git a/src/DateTimePickerDialog.java b/src/DateTimePickerDialog.java
new file mode 100644
index 0000000..798b2a0
--- /dev/null
+++ b/src/DateTimePickerDialog.java
@@ -0,0 +1,2 @@
+public class DateTimePickerDialog {
+}