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

# Conflicts:
#	PythonProject/main.py

PythonProject/main.py

@@ -1,9 +1,17 @@
 from fastapi import FastAPI
 from api.student_api import StudentAPI
 from api.statistics_api import StatisticsAPI
+from api.teacher_api import teacher_api
 from api.grade_api import gradeAPI
 app = FastAPI()
 
 app.include_router(StudentAPI)
 app.include_router(StatisticsAPI)
+
+app.include_router(teacher_api)
+
+
+if __name__ == '__main__':
+    import uvicorn
+    uvicorn.run("main:app",host='0.0.0.0',port=12310)
 app.include_router(gradeAPI)