Merge branch 'develop'

.gitlab-ci.yml

@@ -15,7 +15,7 @@ variables:
   ACR_EE_TAG: $CI_COMMIT_SHA
 
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/csf-admin.git
+  GITLAB_URL: https://oauth2:ZhN6PrYzu9ELfyVq_KE5@git.mmcuav.cn/iuav/csf-admin.git
 
 docker_build_dev:
   stage: dockerbuild

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: 66168c43717b5c751414bf62591ae53d4b1e89e3
+  newTag: af307d7da6105e8fe490c46df020f79e51732a47