Merge remote-tracking branch 'origin/geyuan1' into lon_students_merge_code_test
# Conflicts: # class_management/dao/class_management_dao.py # class_management/main.py # students/README_students.md
This commit is contained in:
@@ -30,7 +30,7 @@ class Students(Base_all):
|
||||
, comment='年龄'
|
||||
, nullable=False)
|
||||
|
||||
sex = Column(Enum(SexEnum, values_callable=lambda e: [i.value for i in e])
|
||||
sex = Column(Enum(SexEnum)
|
||||
, comment='性别'
|
||||
, nullable=False)
|
||||
|
||||
@@ -49,7 +49,7 @@ class Students(Base_all):
|
||||
graduate_time = Column(DATETIME
|
||||
, comment='毕业时间')
|
||||
|
||||
education = Column(Enum(EducationEnum, values_callable=lambda e: [i.value for i in e])
|
||||
education = Column(Enum(EducationEnum)
|
||||
, comment='学历'
|
||||
, nullable=True)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user