Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test
# Conflicts: # class_management/database.py # class_management/main.py
This commit is contained in:
@@ -14,6 +14,7 @@ class ClassInfo(Base_all):
|
||||
)
|
||||
num = Column(String(50)
|
||||
,nullable=False
|
||||
,unique=True
|
||||
,comment='班级编号'
|
||||
)
|
||||
name = Column(String(50)
|
||||
@@ -21,26 +22,18 @@ class ClassInfo(Base_all):
|
||||
,comment='班级名称'
|
||||
)
|
||||
head_teacher_id = Column(Integer
|
||||
# ,ForeignKey('teacher.id')
|
||||
,ForeignKey('teacher.id')
|
||||
,comment='班主任编号'
|
||||
)
|
||||
|
||||
coach_teacher_id = Column(Integer
|
||||
# ,ForeignKey('teacher.id')
|
||||
,ForeignKey('teacher.id')
|
||||
,comment='授课老师编号'
|
||||
)
|
||||
tutor_teacher_id = Column(Integer
|
||||
# ,ForeignKey('teacher.id')
|
||||
,ForeignKey('teacher.id')
|
||||
,comment='助教老师编号'
|
||||
)
|
||||
# class_teacher = Column(String(50)
|
||||
# ,nullable=False
|
||||
# ,comment='班主任'
|
||||
# )
|
||||
# class_lecturer = Column(String(50)
|
||||
# ,nullable=False
|
||||
# ,comment='授课老师'
|
||||
# )
|
||||
class_start_time = Column(Date
|
||||
,comment='开班日期'
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user