From 23fd7b471a34ab6a1093c4e69396d62dca2ec8f9 Mon Sep 17 00:00:00 2001
From: gqp <446105468@qq.com>
Date: Tue, 5 Nov 2024 14:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch
 'refs/remotes/hf2/hyf-agent-tiyan-v2.4.5' into
 _V2.4.X/dev_issue#1683_2.4.5_2_2_32

# Conflicts:
#	frontend/src/api/modules/pkg_manage.js
#	frontend/src/components/common/tag.vue
#	frontend/src/components/setup-table/install-table.vue
#	frontend/src/i18n/en.js
#	frontend/src/i18n/zh.js
#	frontend/src/store/modules/agent.ts
#	frontend/src/types/agent/pkg-manage.ts
#	frontend/src/views/agent/agent-list.vue
#	frontend/src/views/agent/agent-setup/agent-import.vue
#	frontend/src/views/agent/agent-setup/agent-setup.vue
#	frontend/src/views/agent/components/choose-pkg-dialog.vue
#	frontend/src/views/agent/package/index.vue
#	frontend/src/views/agent/package/package-cols.vue
#	frontend/src/views/agent/package/package-upload.vue
#	frontend/src/views/cloud/cloud-manager-add/cloud-manager-setup.vue
#	frontend/src/views/cloud/components/sideslider-content-edit.vue
# Reviewed, transaction id: 22877