Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # kustomization/overlays/dev/kustomization.yaml # kustomization/overlays/prod/kustomization.yaml

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # kustomization/overlays/dev/kustomization.yaml # kustomization/overlays/prod/kustomization.yaml
ce19208a · ZhangLingKun · 15561bc7 · fb28bc72 · ce19208a · ce19208a
--- a/kustomization/overlays/dev/kustomization.yaml
+++ b/kustomization/overlays/dev/kustomization.yaml
@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 4eea4419752ffd6b50165774c140a413e69f726d
+  newTag: b86fbf3b2fa70f004bc36f78b3b9f0f304707ddf
--- a/kustomization/overlays/prod/kustomization.yaml
+++ b/kustomization/overlays/prod/kustomization.yaml
@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: a260db2f1020c2e396a32c63becb0984d431d0b0
+  newTag: ca374754c9670ff0b21edc01eddc0192a2d3b665