Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test

scores/model/score_model.py

@@ -2,6 +2,9 @@ from databases import engine_all,Base_all,Session
 from scores.database import Base
 from datetime import datetime
 from sqlalchemy import DateTime,Column,Integer,String,Float,ForeignKey
+
+
+
 class Score(Base):
 from sqlalchemy import DateTime,Column,Integer,String,Float
 class Score(Base_all):
@@ -23,8 +26,8 @@ class Score(Base_all):
                  ,comment ='考试序次'
                  )
     score = Column(Integer,nullable = False)
-    tsub = Column(String(100)
-                  , ForeignKey('subject.id')
+    t_subject = Column(Integer
+                   ,ForeignKey('subject.id')
                    ,nullable = False
                    )
     create_date = Column(DateTime