Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonOrgFeignClientFallback.java

@@ -1,6 +1,7 @@
 package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.CustomerGridFormDTO;
 import com.epmet.commons.tools.feign.CommonGovOrgFeignClient;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ModuleUtils;
@@ -17,8 +18,8 @@ import org.springframework.stereotype.Component;
 public class CommonOrgFeignClientFallback implements CommonGovOrgFeignClient {
 
     @Override
-    public Result<GridInfoCache> getGridInfo(String gridId) {
+    public Result<GridInfoCache> getGridInfo(CustomerGridFormDTO customerGridFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo", gridId);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo", customerGridFormDTO);
     }