Merge branch 'feat/collaboration2' of github.com:langgenius/dify into feat/collaboration2

This commit is contained in:
hjlarry 2026-04-09 14:29:03 +08:00
commit aa0f7244f7
2 changed files with 4 additions and 2 deletions

View File

@ -307,7 +307,9 @@ class WorkflowCommentMentionUsersApi(Resource):
@console_ns.doc("workflow_comment_mention_users")
@console_ns.doc(description="Get all users in current tenant for mentions")
@console_ns.doc(params={"app_id": "Application ID"})
@console_ns.response(200, "Mentionable users retrieved successfully", console_ns.models[WorkflowCommentMentionUsersPayload.__name__])
@console_ns.response(
200, "Mentionable users retrieved successfully", console_ns.models[WorkflowCommentMentionUsersPayload.__name__]
)
@login_required
@setup_required
@account_initialization_required

View File

@ -4,9 +4,9 @@ from datetime import datetime
from typing import Literal
import pytz
from graphon.file import helpers as file_helpers
from flask import request
from flask_restx import Resource, fields, marshal_with
from graphon.file import helpers as file_helpers
from pydantic import BaseModel, Field, field_validator, model_validator
from sqlalchemy import select
from sqlalchemy.orm import sessionmaker