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

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

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -20,4 +21,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getMyGrids", userId);
     }
+
+    @Override
+    public Result<LatestCustomerResultDTO> getLatestCustomer(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getLatestCustomer", userId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java

@@ -28,6 +28,7 @@ import com.epmet.dao.CustomerStaffAgencyDao;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmFeignClient;