Yichen Jiang
f3f1c7a87d
Merge branch 'feat/plugin-mgmt-3-settings' into feat/plugin-mgmt-4-web
# Conflicts:
# packages/bundle/web-app/package.json
# packages/client/ui-agent-preset/README.i18n.yaml
# packages/client/ui-agent-preset/README.md
# packages/client/ui-agent-preset/README.zh.md
# packages/client/ui-settings-plugin-inventory/README.md
# packages/client/ui-settings-plugin-inventory/README.zh.md
# packages/client/ui-settings-plugin-manager/README.i18n.yaml
# packages/client/ui-settings-plugin-manager/package.json
# packages/client/ui-settings-plugins/README.i18n.yaml
# packages/client/ui-settings-plugins/README.md
# packages/client/ui-settings-plugins/README.zh.md