gmakstutis/ragflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge upstream

Browse source
This commit is contained in:
kevinhu 2023-12-22 18:00:52 +08:00
parent 3c27e6872c
commit 6bd210506b
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/entity/kb2_doc.rs
View file

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

7
src/entity/tag_info.rs
View file

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

3
src/main.rs
View file

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