Merge remote-tracking branch 'origin/dev' into release

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.21
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.22
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.21
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.22
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-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.21</version>
+    <version>0.3.22</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -16,8 +16,7 @@ import java.util.List;
  * @Author yinzuomei
  * @Date 2020/5/13 15:45
  */
-//
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
-@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class,url = "http://localhost:")
 public interface GovIssueFeignClient {
     /**
      * @param gridIdList