Merge branch 'dev_newversion' into dev_temp

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.26
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络