fix: merge errors

This commit is contained in:
naskya 2023-12-27 15:11:07 +09:00
parent 3edcea2c76
commit 9eccdd3044
Signed by: naskya
GPG key ID: 712D413B3A9FED5C

View file

@ -171,11 +171,10 @@ pub enum UserEmojimodpermEnum {
Full, Full,
#[sea_orm(string_value = "mod")] #[sea_orm(string_value = "mod")]
Mod, Mod,
#[default]
#[sea_orm(string_value = "none")] #[sea_orm(string_value = "none")]
Unauthorized, Unauthorized,
} }
#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)] #[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
#[sea_orm( #[sea_orm(
rs_type = "String", rs_type = "String",
db_type = "Enum", db_type = "Enum",