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

# Conflicts:
#	PythonProject/dao/student_dao.py

PythonProject/model/student_model.py

@@ -30,4 +30,3 @@ class Student_Model(Base):
                        ,onupdate=datetime.now)
 
 Base.metadata.create_all(engine)
-

PythonProject/model/teacher_model.py

@@ -1,3 +1,17 @@
-# MaRuiZhi NB
-# MaRuiZhi NB Plus
-# hahaha
+from sqlalchemy import DATETIME,Column, Integer, String, Date,ForeignKey
+from datetime import datetime
+from util.database import Base,engine
+
+class Teacher_Model(Base):
+    __tablename__ = 'wl_teacher'
+    teac_id=Column(Integer,primary_key=True,autoincrement=True,comment='老师编号')
+    teac_name=Column(String(20),comment='老师姓名')
+    teac_gender=Column(String(5),comment='老师性别')
+    teac_age=Column(Integer,comment='老师年龄')
+    teac_position =Column(String(20),comment='老师职位')
+    status=Column(Integer,default=0,comment='课程进度:学习中=0，求职中=1，已就业=2')
+    create_date=Column(DATETIME,default=datetime.now)
+    update_date=Column(DATETIME,default=datetime.now,onupdate=datetime.now)
+
+Base.metadata.create_all(engine)
+

PythonProject/schema/student_schema.py

@@ -45,5 +45,3 @@ class StudentResponse(BaseModel):
             2:'已就业'
         }
         return d1.get(progress,'暂不明确')
-
-