Merge remote-tracking branch 'remotes/origin/develop' into 主线测试

3 years ago · 6d15b3278d
1 changed files with 1 additions and 0 deletions
--- 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
@ -767,6 +767,7 @@
            <!-- 网格没有经纬度时获取客户根组织下的 -->
            IFNULL(cg.longitude,ca.longitude) longitude,
            IFNULL(cg.latitude,ca.latitude) latitude,
            ca.ORGANIZATION_NAME agencyName,
            cg.ABANDON_FLAG
        FROM
            customer_grid cg