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

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
   ACR_EE_TAG: $CI_COMMIT_SHA
 
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/pms.git
+  GITLAB_URL: https://oauth2:ZhN6PrYzu9ELfyVq_KE5@git.mmcuav.cn/iuav/pms.git
 
 mvn_clean:
   stage: clean

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: c6329448cad3f187a60f5e3bd5df9cc050822ece
+  newTag: b7fe2c5728b606167daee21c67c452fea7aca1f8