diff --git a/src/lib/fixDB.ts b/src/lib/fixDB.ts
index 0da1cd3..31dce79 100644
--- a/src/lib/fixDB.ts
+++ b/src/lib/fixDB.ts
@@ -23,9 +23,4 @@ export default async (knex: Knex): Promise<void> => {
       });
     }
   };
-
-  // memories 表新增字段
-  await addColumn("memories", "episodesId", "text");
-  await addColumn("memories", "agentType", "text");
-  await addColumn("memories", "name", "text");
 };
diff --git a/src/types/database.d.ts b/src/types/database.d.ts
index 1af96b9..8127545 100644
--- a/src/types/database.d.ts
+++ b/src/types/database.d.ts
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 // @db-hash 6fa5017e455bc367c9c902ba574d11b4
+=======
+// @db-hash 4ab04ca9077c96cd2ff345a886cbae8f
+>>>>>>> 753bd4c (修补107bug)
 //该文件由脚本自动生成，请勿手动修改
 
 export interface memories {
@@ -40,12 +44,32 @@ export interface o_artStyle {
   'prompt'?: string | null;
 }
 export interface o_assets {
+<<<<<<< HEAD
   'assetsId'?: number | null;
   'describe'?: string | null;
   'flowId'?: number | null;
+=======
+  'describe'?: string | null;
+  'filePath'?: string | null;
+>>>>>>> 753bd4c (修补107bug)
   'id'?: number;
   'imageId'?: number | null;
   'name'?: string | null;
+<<<<<<< HEAD
+=======
+  'projectId'?: number | null;
+  'prompt'?: string | null;
+  'remark'?: string | null;
+  'sonId'?: number | null;
+  'startTime'?: number | null;
+  'state'?: string | null;
+  'type'?: string | null;
+}
+export interface o_chatHistory {
+  'data'?: string | null;
+  'id'?: number;
+  'novel'?: string | null;
+>>>>>>> 753bd4c (修补107bug)
   'projectId'?: number | null;
   'prompt'?: string | null;
   'promptErrorReason'?: string | null;
@@ -80,6 +104,7 @@ export interface o_image {
   'state'?: string | null;
   'type'?: string | null;
 }
+<<<<<<< HEAD
 export interface o_imageFlow {
   'flowData': string;
   'id'?: number;
@@ -127,6 +152,17 @@ export interface o_prompt {
   'data'?: string | null;
   'id'?: number;
   'name'?: string | null;
+=======
+export interface o_model {
+  'apiKey'?: string | null;
+  'baseUrl'?: string | null;
+  'createTime'?: number | null;
+  'id'?: number;
+  'index'?: number | null;
+  'manufacturer'?: string | null;
+  'model'?: string | null;
+  'modelType'?: string | null;
+>>>>>>> 753bd4c (修补107bug)
   'type'?: string | null;
 }
 export interface o_script {
@@ -190,6 +226,89 @@ export interface o_tasks {
   'state'?: string | null;
   'taskClass'?: string | null;
 }
+<<<<<<< HEAD
+=======
+export interface o_novel {
+  'chapter'?: string | null;
+  'chapterData'?: string | null;
+  'chapterIndex'?: number | null;
+  'createTime'?: number | null;
+  'id'?: number;
+  'projectId'?: number | null;
+  'reel'?: string | null;
+}
+export interface o_outline {
+  'data'?: string | null;
+  'episode'?: number | null;
+  'id'?: number;
+  'projectId'?: number | null;
+}
+export interface o_outlineNovel {
+  'id'?: number;
+  'novelId'?: number | null;
+  'outlineId'?: number | null;
+}
+export interface o_project {
+  'artStyle'?: string | null;
+  'createTime'?: number | null;
+  'id'?: number | null;
+  'intro'?: string | null;
+  'name'?: string | null;
+  'projectType'?: string | null;
+  'type'?: string | null;
+  'userId'?: number | null;
+  'videoRatio'?: string | null;
+}
+export interface o_prompts {
+  'code'?: string | null;
+  'customValue'?: string | null;
+  'defaultValue'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'parentCode'?: string | null;
+  'type'?: string | null;
+}
+export interface o_script {
+  'content'?: string | null;
+  'createTime'?: number | null;
+  'id'?: number;
+  'name'?: string | null;
+  'projectId'?: number | null;
+}
+export interface o_scriptAssets {
+  'assetsId'?: number | null;
+  'id'?: number;
+  'scriptId'?: number | null;
+}
+export interface o_scriptOutline {
+  'id'?: number;
+  'outlineId'?: number | null;
+  'scriptId'?: number | null;
+}
+export interface o_setting {
+  'id'?: number;
+  'imageModel'?: string | null;
+  'languageModel'?: string | null;
+  'projectId'?: number | null;
+  'tokenKey'?: string | null;
+  'userId'?: number | null;
+}
+export interface o_skills {
+  'id'?: number;
+  'name'?: string | null;
+  'startTime'?: number | null;
+}
+export interface o_storyboard {
+  'createTime'?: number | null;
+  'id'?: number;
+  'name'?: string | null;
+}
+export interface o_storyboardScript {
+  'id'?: number;
+  'scriptId'?: number | null;
+  'storyboardId'?: number | null;
+}
+>>>>>>> 753bd4c (修补107bug)
 export interface o_user {
   'id'?: number;
   'name'?: string | null;
@@ -209,6 +328,185 @@ export interface o_vendorConfig {
   'name'?: string | null;
 }
 export interface o_video {
+<<<<<<< HEAD
+=======
+  'configId'?: number | null;
+  'errorReason'?: string | null;
+  'filePath'?: string | null;
+  'firstFrame'?: string | null;
+  'id'?: number;
+  'model'?: string | null;
+  'prompt'?: string | null;
+  'resolution'?: string | null;
+  'scriptId'?: number | null;
+  'state'?: number | null;
+  'storyboardImgs'?: string | null;
+  'time'?: number | null;
+}
+export interface o_videoConfig {
+  'aiConfigId'?: number | null;
+  'audioEnabled'?: number | null;
+  'createTime'?: number | null;
+  'duration'?: number | null;
+  'endFrame'?: string | null;
+  'id'?: number;
+  'images'?: string | null;
+  'manufacturer'?: string | null;
+  'mode'?: string | null;
+  'projectId'?: number | null;
+  'prompt'?: string | null;
+  'resolution'?: string | null;
+  'scriptId'?: number | null;
+  'selectedResultId'?: number | null;
+  'startFrame'?: string | null;
+  'updateTime'?: number | null;
+}
+export interface t_aiModelMap {
+  'configId'?: number | null;
+  'id'?: number;
+  'key'?: string | null;
+  'name'?: string | null;
+}
+export interface t_artStyle {
+  'id'?: number;
+  'name'?: string | null;
+  'styles'?: string | null;
+}
+export interface t_assets {
+  'duration'?: string | null;
+  'episode'?: string | null;
+  'filePath'?: string | null;
+  'id'?: number;
+  'intro'?: string | null;
+  'name'?: string | null;
+  'projectId'?: number | null;
+  'prompt'?: string | null;
+  'remark'?: string | null;
+  'scriptId'?: number | null;
+  'segmentId'?: number | null;
+  'shotIndex'?: number | null;
+  'state'?: string | null;
+  'type'?: string | null;
+  'videoPrompt'?: string | null;
+}
+export interface t_chatHistory {
+  'data'?: string | null;
+  'id'?: number;
+  'novel'?: string | null;
+  'projectId'?: number | null;
+  'type'?: string | null;
+}
+export interface t_config {
+  'apiKey'?: string | null;
+  'baseUrl'?: string | null;
+  'createTime'?: number | null;
+  'id'?: number;
+  'manufacturer'?: string | null;
+  'model'?: string | null;
+  'modelType'?: string | null;
+  'type'?: string | null;
+  'userId'?: number | null;
+}
+export interface t_image {
+  'assetsId'?: number | null;
+  'filePath'?: string | null;
+  'id'?: number;
+  'projectId'?: number | null;
+  'scriptId'?: number | null;
+  'state'?: string | null;
+  'type'?: string | null;
+  'videoId'?: number | null;
+}
+export interface t_imageModel {
+  'grid'?: number | null;
+  'id'?: number;
+  'manufacturer'?: string | null;
+  'model'?: string | null;
+  'type'?: string | null;
+}
+export interface t_novel {
+  'chapter'?: string | null;
+  'chapterData'?: string | null;
+  'chapterIndex'?: number | null;
+  'createTime'?: number | null;
+  'id'?: number;
+  'projectId'?: number | null;
+  'reel'?: string | null;
+}
+export interface t_outline {
+  'data'?: string | null;
+  'episode'?: number | null;
+  'id'?: number;
+  'projectId'?: number | null;
+}
+export interface t_project {
+  'artStyle'?: string | null;
+  'createTime'?: number | null;
+  'id'?: number | null;
+  'intro'?: string | null;
+  'name'?: string | null;
+  'type'?: string | null;
+  'userId'?: number | null;
+  'videoRatio'?: string | null;
+}
+export interface t_prompts {
+  'code'?: string | null;
+  'customValue'?: string | null;
+  'defaultValue'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'parentCode'?: string | null;
+  'type'?: string | null;
+}
+export interface t_script {
+  'content'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'outlineId'?: number | null;
+  'projectId'?: number | null;
+}
+export interface t_setting {
+  'id'?: number;
+  'imageModel'?: string | null;
+  'languageModel'?: string | null;
+  'projectId'?: number | null;
+  'tokenKey'?: string | null;
+  'userId'?: number | null;
+}
+export interface t_storyline {
+  'content'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'novelIds'?: string | null;
+  'projectId'?: number | null;
+}
+export interface t_taskList {
+  'endTime'?: string | null;
+  'id'?: number;
+  'name'?: string | null;
+  'projectName'?: number | null;
+  'prompt'?: string | null;
+  'startTime'?: string | null;
+  'state'?: string | null;
+}
+export interface t_textModel {
+  'id'?: number;
+  'image'?: number | null;
+  'manufacturer'?: string | null;
+  'model'?: string | null;
+  'responseFormat'?: string | null;
+  'think'?: number | null;
+  'tool'?: number | null;
+}
+export interface t_user {
+  'id'?: number;
+  'name'?: string | null;
+  'password'?: string | null;
+}
+export interface t_video {
+  'aiConfigId'?: number | null;
+  'configId'?: number | null;
+>>>>>>> 753bd4c (修补107bug)
   'errorReason'?: string | null;
   'filePath'?: string | null;
   'id'?: number;
@@ -256,5 +554,29 @@ export interface DB {
   "o_user": o_user;
   "o_vendorConfig": o_vendorConfig;
   "o_video": o_video;
+<<<<<<< HEAD
   "o_videoTrack": o_videoTrack;
+=======
+  "o_videoConfig": o_videoConfig;
+  "t_aiModelMap": t_aiModelMap;
+  "t_artStyle": t_artStyle;
+  "t_assets": t_assets;
+  "t_chatHistory": t_chatHistory;
+  "t_config": t_config;
+  "t_image": t_image;
+  "t_imageModel": t_imageModel;
+  "t_novel": t_novel;
+  "t_outline": t_outline;
+  "t_project": t_project;
+  "t_prompts": t_prompts;
+  "t_script": t_script;
+  "t_setting": t_setting;
+  "t_storyline": t_storyline;
+  "t_taskList": t_taskList;
+  "t_textModel": t_textModel;
+  "t_user": t_user;
+  "t_video": t_video;
+  "t_videoConfig": t_videoConfig;
+  "t_videoModel": t_videoModel;
+>>>>>>> 753bd4c (修补107bug)
 }