Merge branches 'master' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release

Conflicts: epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml epmet-module/gov-org/gov-org-server/pom.xml
5 years ago · b6379df34d
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-org-server:
    container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.80
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.81
    ports:
      - "8092:8092"
    network_mode: host # 使用现有网络