From 9eccdd3044828f13626439a85b2bf5f5aa8f2a3e Mon Sep 17 00:00:00 2001 From: naskya Date: Wed, 27 Dec 2023 15:11:07 +0900 Subject: [PATCH] fix: merge errors --- .../native-utils/src/model/entity/sea_orm_active_enums.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs b/packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs index 37fb64d9..baf21fed 100644 --- a/packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs +++ b/packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs @@ -171,11 +171,10 @@ pub enum UserEmojimodpermEnum { Full, #[sea_orm(string_value = "mod")] Mod, - #[default] #[sea_orm(string_value = "none")] Unauthorized, } -#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)] +#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)] #[sea_orm( rs_type = "String", db_type = "Enum",