Skip to content

Commit 2a99d23

Browse files
committed
Merge remote-tracking branch 'origin/feat/1.8.0/new-cp-fe' into test
# Conflicts: # docs/docs.go # docs/swagger.json # docs/swagger.yaml # internal/base/constant/site_type.go # internal/controller/ai_controller.go # internal/controller/siteinfo_controller.go # internal/migrations/migrations.go # internal/schema/siteinfo_schema.go # internal/service/mock/siteinfo_repo_mock.go
2 parents 8b61cad + 9fbf9e4 commit 2a99d23

4 files changed

Lines changed: 928 additions & 1690 deletions

File tree

0 commit comments

Comments
 (0)