Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -8,6 +8,7 @@
 !/manage.py
 !/README.md
 !/.gitignore
+!/.gitlab-ci.yml
 
 ### NotepadPP template
 # Notepad++ backups #

.gitlab-ci.yml

+stages:
+  - deploy
+deploy_job:
+  stage: deploy
+  script:
+    - cd "E:\datacenter"
+    - git checkout test
+    - git pull
+  only:
+    # 只有test分支才执行
+    - test
+  tags:
+    - "36"
\ No newline at end of file

README.md

@@ -4,4 +4,7 @@
 
 项目根目录下static和media两个文件夹不会上传到代码仓库，**如果有修改需要通知其他成员同步。**
 
-**_TODO: 服务器环境需要建立一个conda._**
\ No newline at end of file
+**_TODO: 服务器环境需要建立一个conda._**
+
+# requirements:
+django 3.1.4
\ No newline at end of file