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

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.47
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.48
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
@@ -15,4 +15,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 300M
+          memory: 300M

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.47</version>
+    <version>0.3.48</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>
@@ -386,4 +386,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>