Merge branch 'dev' of http://106.13.42.156:33077/lei_y601/yj_resume

# Conflicts:
#	main.py

db/sql_db.py

@@ -10,6 +10,7 @@ DB_PATH = config('DB_PATH', default='D://PycharmProject//yj_resume//main.sqlite3
 class DBTASK(Base):
     __tablename__ = 'db_task'
     id = Column(String(100), primary_key=True)
+    name = Column(String(100), nullable=False)
     create_time = Column(DateTime, nullable=False, )
     # 0 代表待执行，1 成功，2 失败
     status = Column(Integer, nullable=False, default=0)