From 68c37c3c2faab4e897150f23a08aef93fbfc5443 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 20 Mar 2020 18:08:12 +0800 Subject: [PATCH] =?UTF-8?q?dev1.0=E6=9C=AC=E5=9C=B0=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 4 ++-- .../src/main/java/com/epmet/feign/GovOrgFeignClient.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index c18e744373..dcad7821b6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -100,7 +100,7 @@ ORDER BY CONVERT ( a.grid_name USING gbk ) ASC - LIMIT 99999 + ) UNION @@ -119,7 +119,7 @@ ]]> ORDER BY CONVERT ( b.grid_name USING gbk ) ASC - LIMIT 999999 + ) ) AS c LIMIT #{pageNo}, #{pageSize} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index c6721d4c14..fc2828fd05 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -20,7 +20,7 @@ import java.util.List; * @Author wangc * @date 2020.03.17 14:29 */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class, url="http://localhost:8092") public interface GovOrgFeignClient { /**