Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 66b49a71dffb90bd5d6c1e5f898749d69ad51378
+  newTag: 7c4c60dac1a2dd467d82c0482d4b4cc4d992f078

kustomization/overlays/prod/configMap.yaml

@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: cms-map
 data:
-  SPRING_PROFILES_ACTIVE: prod
\ No newline at end of file
+  SPRING_PROFILES_ACTIVE: dev
\ No newline at end of file