Merge remote-tracking branch 'origin/master'

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

@@ -793,7 +793,11 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
     @Override
     public Result<IcNeighborHoodEntity> neighborhoodDetail(String neighborhoodId) {
-        return new Result<IcNeighborHoodEntity>().ok(baseDao.selectById(neighborhoodId));
+        IcNeighborHoodEntity result = baseDao.selectById(neighborhoodId);
+        if(null != result && null == result.getRemark()){
+            result.setRemark("");
+        }
+        return new Result<IcNeighborHoodEntity>().ok(result);
     }
 
 }