Merge remote-tracking branch 'remotes/origin/dev_py_gridmember' into develop

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -585,5 +585,7 @@ public interface GovOrgOpenFeignClient {
     Result<IcResiUserOrgMsgResultDTO> icResiUserOrgMsg(@RequestBody IcResiUserOrgMsgFormDTO formDTO);
 
     @PostMapping("/gov/org/customergrid/getstaffgridlist")
-    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId, @RequestParam("orgId") String orgId, @RequestParam("orgType") String orgType);
+    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId,
+                                                              @RequestParam("orgId") String orgId,
+                                                              @RequestParam("orgType") String orgType);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -382,6 +382,6 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
 
     @Override
     public Result<List<CustomerStaffGridResultDTO>> getStaffGridList(String customerId, String orgId, String orgType) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList", orgId, orgType);
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList",customerId, orgId, orgType);
     }
 }