You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2024/07/25 02:10:56 UTC
(incubator-answer) 05/05: Merge branch 'dev' into feat/1.3.6/user
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch feat/1.3.6/user
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 8cb5dd993f35af993f880ed7cb7c0565a677f3c7
Merge: 8f30a153 bbefbbcb
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Thu Jul 25 10:10:34 2024 +0800
Merge branch 'dev' into feat/1.3.6/user
docs/docs.go | 28 +++++++++++++++-------------
docs/swagger.json | 28 +++++++++++++++-------------
docs/swagger.yaml | 22 +++++++++++++---------
i18n/en_US.yaml | 3 +++
internal/controller/meta_controller.go | 2 +-
internal/repo/user/user_repo.go | 2 +-
internal/schema/backyard_user_schema.go | 1 +
internal/service/user_admin/user_backyard.go | 1 +
ui/src/hooks/useChangeProfileModal/index.tsx | 23 +++++++++++++++++++++--
ui/src/services/admin/users.ts | 1 +
10 files changed, 72 insertions(+), 39 deletions(-)