This is an automated email from the ASF dual-hosted git repository.
shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/answer.git
commit 9f420e67d2d7ecb0dbe1f57d1e773bda2edcaf72
Merge: 36d2904b 83145487
Author: shuai <lishuail...@sifou.com>
AuthorDate: Sun Apr 27 11:59:34 2025 +0800
Merge branch 'dev' into test
cmd/command.go | 11 +-
docs/docs.go | 3 +-
docs/swagger.json | 3 +-
docs/swagger.yaml | 1 +
i18n/en_US.yaml | 11 +
i18n/zh_CN.yaml | 9 +
internal/controller/tag_controller.go | 29 +++
internal/repo/activity_common/follow.go | 107 ++++++++
internal/repo/tag/tag_rel_repo.go | 55 ++++
internal/router/answer_api_router.go | 1 +
internal/schema/tag_schema.go | 16 ++
internal/schema/user_schema.go | 2 +-
internal/service/activity_common/follow.go | 1 +
internal/service/permission/permission_name.go | 2 +
internal/service/permission/tag_permission.go | 11 +-
internal/service/tag/tag_service.go | 60 ++++-
internal/service/tag_common/tag_common.go | 8 +
.../Tags/Info/components/MergeTagModal/index.scss | 6 +
.../Tags/Info/components/MergeTagModal/index.tsx | 206 +++++++++++++++
ui/src/pages/Tags/Info/index.tsx | 277 ++++++++++++---------
ui/src/services/client/tag.ts | 6 +
21 files changed, 691 insertions(+), 134 deletions(-)
