Merge remote-tracking branch 'remotes/origin/dev' into 市北生产

# Conflicts:
#	epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
#	epmet-auth/deploy/docker-compose-prod.yml
#	epmet-gateway/deploy/docker-compose-prod.yml
#	epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
#	epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
#	epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
#	epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
#	epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
#	epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
#	epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
#	epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
#	epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
#	epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
#	epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/common-service-server:0.3.44
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/common-service-server:version_placeholder
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/epmet-message-server:0.3.57
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/epmet-message-server:version_placeholder
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/gov-issue-server:0.3.101
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/gov-issue-server:version_placeholder
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-voice-server:
     container_name: resi-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/resi-voice-server:0.3.12
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epdc-cloud-yinzhu/resi-voice-server:version_placeholder
     ports:
       - "8106:8106"
     network_mode: host # 使用现有网络