diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/EduSystem.iml b/.idea/EduSystem.iml
new file mode 100644
index 0000000..8388dbc
--- /dev/null
+++ b/.idea/EduSystem.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..a44b4ce
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,33 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="11">
+            <item index="0" class="java.lang.String" itemvalue="pandas" />
+            <item index="1" class="java.lang.String" itemvalue="certifi" />
+            <item index="2" class="java.lang.String" itemvalue="charset-normalizer" />
+            <item index="3" class="java.lang.String" itemvalue="tzdata" />
+            <item index="4" class="java.lang.String" itemvalue="et-xmlfile" />
+            <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="pytz" />
+            <item index="7" class="java.lang.String" itemvalue="requsets" />
+            <item index="8" class="java.lang.String" itemvalue="openpyxl" />
+            <item index="9" class="java.lang.String" itemvalue="xlwt" />
+            <item index="10" class="java.lang.String" itemvalue="urllib3" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+          <option value="N802" />
+          <option value="N803" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d56657a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..4236f4c
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/EduSystem.iml" filepath="$PROJECT_DIR$/.idea/EduSystem.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/EduSystemServer/API/__pycache__/__init__.cpython-39.pyc b/EduSystemServer/API/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..14641dd
Binary files /dev/null and b/EduSystemServer/API/__pycache__/__init__.cpython-39.pyc differ
diff --git a/EduSystemServer/API/__pycache__/admin.cpython-39.pyc b/EduSystemServer/API/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 0000000..7f8c3f3
Binary files /dev/null and b/EduSystemServer/API/__pycache__/admin.cpython-39.pyc differ
diff --git a/EduSystemServer/API/__pycache__/models.cpython-39.pyc b/EduSystemServer/API/__pycache__/models.cpython-39.pyc
new file mode 100644
index 0000000..f32bab2
Binary files /dev/null and b/EduSystemServer/API/__pycache__/models.cpython-39.pyc differ
diff --git a/EduSystemServer/API/__pycache__/urls.cpython-39.pyc b/EduSystemServer/API/__pycache__/urls.cpython-39.pyc
new file mode 100644
index 0000000..91aba38
Binary files /dev/null and b/EduSystemServer/API/__pycache__/urls.cpython-39.pyc differ
diff --git a/EduSystemServer/API/__pycache__/views.cpython-39.pyc b/EduSystemServer/API/__pycache__/views.cpython-39.pyc
new file mode 100644
index 0000000..8ea63e3
Binary files /dev/null and b/EduSystemServer/API/__pycache__/views.cpython-39.pyc differ
diff --git a/EduSystemServer/EduSystemServer/.idea/.gitignore b/EduSystemServer/EduSystemServer/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/EduSystemServer/EduSystemServer/.idea/EduSystemServer.iml b/EduSystemServer/EduSystemServer/.idea/EduSystemServer.iml
new file mode 100644
index 0000000..803a5fe
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/EduSystemServer.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="settings.py" />
+        <option name="manageScript" value="manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/Project_Default.xml b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..a44b4ce
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,33 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="11">
+            <item index="0" class="java.lang.String" itemvalue="pandas" />
+            <item index="1" class="java.lang.String" itemvalue="certifi" />
+            <item index="2" class="java.lang.String" itemvalue="charset-normalizer" />
+            <item index="3" class="java.lang.String" itemvalue="tzdata" />
+            <item index="4" class="java.lang.String" itemvalue="et-xmlfile" />
+            <item index="5" class="java.lang.String" itemvalue="numpy" />
+            <item index="6" class="java.lang.String" itemvalue="pytz" />
+            <item index="7" class="java.lang.String" itemvalue="requsets" />
+            <item index="8" class="java.lang.String" itemvalue="openpyxl" />
+            <item index="9" class="java.lang.String" itemvalue="xlwt" />
+            <item index="10" class="java.lang.String" itemvalue="urllib3" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+          <option value="N802" />
+          <option value="N803" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/profiles_settings.xml b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/.idea/misc.xml b/EduSystemServer/EduSystemServer/.idea/misc.xml
new file mode 100644
index 0000000..a73aa05
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="C:\E\anaconda3" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/.idea/modules.xml b/EduSystemServer/EduSystemServer/.idea/modules.xml
new file mode 100644
index 0000000..d842152
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/EduSystemServer.iml" filepath="$PROJECT_DIR$/.idea/EduSystemServer.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/.idea/vcs.xml b/EduSystemServer/EduSystemServer/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/EduSystemServer/EduSystemServer/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/EduSystemServer/EduSystemServer/__pycache__/__init__.cpython-39.pyc b/EduSystemServer/EduSystemServer/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..5f288d9
Binary files /dev/null and b/EduSystemServer/EduSystemServer/__pycache__/__init__.cpython-39.pyc differ
diff --git a/EduSystemServer/EduSystemServer/__pycache__/settings.cpython-39.pyc b/EduSystemServer/EduSystemServer/__pycache__/settings.cpython-39.pyc
new file mode 100644
index 0000000..1514913
Binary files /dev/null and b/EduSystemServer/EduSystemServer/__pycache__/settings.cpython-39.pyc differ
diff --git a/EduSystemServer/EduSystemServer/__pycache__/urls.cpython-39.pyc b/EduSystemServer/EduSystemServer/__pycache__/urls.cpython-39.pyc
new file mode 100644
index 0000000..073108e
Binary files /dev/null and b/EduSystemServer/EduSystemServer/__pycache__/urls.cpython-39.pyc differ
diff --git a/EduSystemServer/EduSystemServer/settings.py b/EduSystemServer/EduSystemServer/settings.py
index 34c413d..75318b2 100644
--- a/EduSystemServer/EduSystemServer/settings.py
+++ b/EduSystemServer/EduSystemServer/settings.py
@@ -41,7 +41,11 @@ INSTALLED_APPS = [
     'Student',
     'teacher',
     'course',
+<<<<<<< Updated upstream
     'Eduadmin',
+=======
+    # 'admin1',
+>>>>>>> Stashed changes
 ]
 
 MIDDLEWARE = [
diff --git a/EduSystemServer/Student/__pycache__/__init__.cpython-39.pyc b/EduSystemServer/Student/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..6842f24
Binary files /dev/null and b/EduSystemServer/Student/__pycache__/__init__.cpython-39.pyc differ
diff --git a/EduSystemServer/Student/__pycache__/admin.cpython-39.pyc b/EduSystemServer/Student/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 0000000..287aaea
Binary files /dev/null and b/EduSystemServer/Student/__pycache__/admin.cpython-39.pyc differ
diff --git a/EduSystemServer/Student/__pycache__/models.cpython-39.pyc b/EduSystemServer/Student/__pycache__/models.cpython-39.pyc
new file mode 100644
index 0000000..5515950
Binary files /dev/null and b/EduSystemServer/Student/__pycache__/models.cpython-39.pyc differ
diff --git a/EduSystemServer/course/__pycache__/__init__.cpython-39.pyc b/EduSystemServer/course/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..7872ab8
Binary files /dev/null and b/EduSystemServer/course/__pycache__/__init__.cpython-39.pyc differ
diff --git a/EduSystemServer/course/__pycache__/admin.cpython-39.pyc b/EduSystemServer/course/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 0000000..043a606
Binary files /dev/null and b/EduSystemServer/course/__pycache__/admin.cpython-39.pyc differ
diff --git a/EduSystemServer/course/__pycache__/models.cpython-39.pyc b/EduSystemServer/course/__pycache__/models.cpython-39.pyc
new file mode 100644
index 0000000..3971deb
Binary files /dev/null and b/EduSystemServer/course/__pycache__/models.cpython-39.pyc differ
diff --git a/EduSystemServer/teacher/__pycache__/__init__.cpython-39.pyc b/EduSystemServer/teacher/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000..0acf5cf
Binary files /dev/null and b/EduSystemServer/teacher/__pycache__/__init__.cpython-39.pyc differ
diff --git a/EduSystemServer/teacher/__pycache__/admin.cpython-39.pyc b/EduSystemServer/teacher/__pycache__/admin.cpython-39.pyc
new file mode 100644
index 0000000..8f59558
Binary files /dev/null and b/EduSystemServer/teacher/__pycache__/admin.cpython-39.pyc differ
diff --git a/EduSystemServer/teacher/__pycache__/models.cpython-39.pyc b/EduSystemServer/teacher/__pycache__/models.cpython-39.pyc
new file mode 100644
index 0000000..cd590d5
Binary files /dev/null and b/EduSystemServer/teacher/__pycache__/models.cpython-39.pyc differ
diff --git a/EduSystemServer/teacher/models.py b/EduSystemServer/teacher/models.py
index c31a43e..4eca1f1 100644
--- a/EduSystemServer/teacher/models.py
+++ b/EduSystemServer/teacher/models.py
@@ -3,7 +3,7 @@ from django.db import models
 
 # Create your models here.
 class Teacher(models.Model):
-    tid = models.AutoField(primary_key=True, verbose_name="教师编号")
+    tid = models.AutoField(primary_key=True, verbose_name="教师编号", name="tid")
     t_name = models.CharField(max_length=255, verbose_name="教师名称", name="t_name")
     sex = models.CharField(max_length=128, verbose_name="教师性别", name="t_sex")
     title = models.CharField(max_length=128, verbose_name="教师职称", name="t_title")