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 e1ff07318ef0f04bc23fd12bc80c6bb21c9eb69c
Merge: 52e1b8bd e3151c1d
Author: shuai <[email protected]>
AuthorDate: Thu Oct 23 18:13:31 2025 +0800

    fix: conflict

 i18n/en_US.yaml                              | 16 ++++++++---
 internal/base/reason/reason.go               |  1 +
 internal/migrations/init.go                  |  1 +
 internal/migrations/v28.go                   |  2 ++
 internal/schema/question_schema.go           | 26 +++---------------
 internal/schema/siteinfo_schema.go           |  1 +
 internal/service/content/question_service.go | 40 ++++++++++++++++++++++++++++
 internal/service/question_common/question.go |  8 ++++++
 ui/src/common/interface.ts                   |  1 +
 ui/src/components/TagSelector/index.tsx      |  5 ++--
 ui/src/pages/Admin/Write/index.tsx           | 33 +++++++++++++++++++----
 ui/src/pages/Questions/Ask/index.tsx         | 23 ++++++++++++----
 ui/src/stores/writeSetting.ts                |  1 +
 13 files changed, 118 insertions(+), 40 deletions(-)


Reply via email to