Merge remote-tracking branch 'origin/master'

# Conflicts:
#	epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
#	epmet-module/data-report/data-report-server/pom.xml

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.201
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.202
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.201</version>
+    <version>0.3.202</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.324
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.325
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.324</version>
+    <version>0.3.325</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>