Merge remote-tracking branch 'upstream/main' into feat/base-service-delivery

Browse Source

# Conflicts:
#	ansible/mysql-deploy.yml
#	frontend/src/api/delivery.ts
#	frontend/src/views/service/Catalog.vue
#	server/.env.example
#	server/internal/config/config.go
#	server/internal/handler/task_log.go
#	server/internal/service/delivery.go

...

This commit is contained in:

mac

2026-07-28 15:08:37 +08:00

parent 8e09c30d21 7d6efeb3dd

commit 897670b721

15 changed files with 1145 additions and 345 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

server/internal/service/delivery.go

+572 -269

File diff suppressed because it is too large Load Diff