merge upstream

src/entity/kb2_doc.rs

@@ -11,7 +11,6 @@ pub struct Model {
     pub kb_id: i64,
     #[sea_orm(index)]
     pub did: i64,
-<<<<<<< HEAD
     #[serde(skip_deserializing)]
     pub kb_progress: f32,
     #[serde(skip_deserializing)]
@@ -20,8 +19,6 @@ pub struct Model {
     pub updated_at: DateTime<FixedOffset>,
     #[serde(skip_deserializing)]
     pub is_deleted: bool,
-=======
->>>>>>> upstream/main
 }
 
 #[derive(Debug, Clone, Copy, EnumIter)]

src/entity/tag_info.rs

@@ -11,19 +11,12 @@ pub struct Model {
     #[sea_orm(index)]
     pub uid: i64,
     pub tag_name: String,
-<<<<<<< HEAD
     #[serde(skip_deserializing)]
     pub regx: String,
     pub color: i16,
     pub icon: i16,
     #[serde(skip_deserializing)]
     pub folder_id: i64,
-=======
-    pub regx: Option<String>,
-    pub color: u16,
-    pub icon: u16,
-    pub dir: Option<String>,
->>>>>>> upstream/main
 
     #[serde(skip_deserializing)]
     pub created_at: DateTime<FixedOffset>,

src/main.rs

@@ -98,11 +98,8 @@ fn init(cfg: &mut web::ServiceConfig) {
     cfg.service(api::kb_info::delete);
     cfg.service(api::kb_info::list);
     cfg.service(api::kb_info::add_docs_to_kb);
-<<<<<<< HEAD
     cfg.service(api::kb_info::anti_kb_docs);
     cfg.service(api::kb_info::all_relevents);
-=======
->>>>>>> upstream/main
 
     cfg.service(api::doc_info::list);
     cfg.service(api::doc_info::delete);