diff --git a/api/models/account.py b/api/models/account.py
index c9861039ff..01bf9d5f77 100644
--- a/api/models/account.py
+++ b/api/models/account.py
@@ -201,7 +201,7 @@ class Tenant(Base):
 
     id: Mapped[str] = mapped_column(StringUUID, server_default=db.text("uuid_generate_v4()"))
     name: Mapped[str] = mapped_column(db.String(255))
-    encrypt_public_key: Mapped[Optional[str]] = mapped_column(db.Text)
+    encrypt_public_key = db.Column(db.Text)
     plan: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'basic'::character varying"))
     status: Mapped[str] = mapped_column(db.String(255), server_default=db.text("'normal'::character varying"))
     custom_config: Mapped[Optional[str]] = mapped_column(db.Text)
diff --git a/api/models/dataset.py b/api/models/dataset.py
index 953ea266b7..d5a13efb90 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -59,8 +59,8 @@ class Dataset(Base):
     created_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
     updated_by = mapped_column(StringUUID, nullable=True)
     updated_at = mapped_column(db.DateTime, nullable=False, server_default=func.current_timestamp())
-    embedding_model = db.Column(db.String(255), nullable=True) # TODO: mapped_column
-    embedding_model_provider = db.Column(db.String(255), nullable=True) # TODO: mapped_column
+    embedding_model = db.Column(db.String(255), nullable=True)  # TODO: mapped_column
+    embedding_model_provider = db.Column(db.String(255), nullable=True)  # TODO: mapped_column
     collection_binding_id = mapped_column(StringUUID, nullable=True)
     retrieval_model = mapped_column(JSONB, nullable=True)
     built_in_field_enabled = mapped_column(db.Boolean, nullable=False, server_default=db.text("false"))
diff --git a/api/models/model.py b/api/models/model.py
index e496aa6a92..244507c757 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -80,7 +80,7 @@ class App(Base):
     description: Mapped[str] = mapped_column(db.Text, server_default=db.text("''::character varying"))
     mode: Mapped[str] = mapped_column(db.String(255))
     icon_type: Mapped[Optional[str]] = mapped_column(db.String(255))  # image, emoji
-    icon: Mapped[Optional[str]] = mapped_column(db.String(255))
+    icon = db.Column(db.String(255))
     icon_background: Mapped[Optional[str]] = mapped_column(db.String(255))
     app_model_config_id = mapped_column(StringUUID, nullable=True)
     workflow_id = mapped_column(StringUUID, nullable=True)
@@ -907,7 +907,7 @@ class Message(Base):
     message_tokens: Mapped[int] = mapped_column(db.Integer, nullable=False, server_default=db.text("0"))
     message_unit_price = mapped_column(db.Numeric(10, 4), nullable=False)
     message_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
-    answer = mapped_column(db.Text, nullable=False)
+    answer = db.Column(db.Text, nullable=False)
     answer_tokens: Mapped[int] = mapped_column(db.Integer, nullable=False, server_default=db.text("0"))
     answer_unit_price = mapped_column(db.Numeric(10, 4), nullable=False)
     answer_price_unit = mapped_column(db.Numeric(10, 7), nullable=False, server_default=db.text("0.001"))
@@ -1326,7 +1326,7 @@ class MessageAnnotation(Base):
     app_id: Mapped[str] = mapped_column(StringUUID)
     conversation_id: Mapped[Optional[str]] = mapped_column(StringUUID, db.ForeignKey("conversations.id"))
     message_id: Mapped[Optional[str]] = mapped_column(StringUUID)
-    question: Mapped[Optional[str]] = mapped_column(db.Text)
+    question = db.Column(db.Text, nullable=True)
     content = mapped_column(db.Text, nullable=False)
     hit_count = mapped_column(db.Integer, nullable=False, server_default=db.text("0"))
     account_id = mapped_column(StringUUID, nullable=False)