Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java

@@ -380,7 +380,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         if (!gridInfoResult.success()) {
             throw new RenException(gridInfoResult.getCode());
         }
-        result.setGridName(gridInfoResult.getData().getParentAgencyName() + StrConstant.HYPHEN + gridInfoResult.getData().getGridName());
+        //result.setGridName(gridInfoResult.getData().getParentAgencyName() + StrConstant.HYPHEN + gridInfoResult.getData().getGridName());
+        result.setGridName(gridInfoResult.getData().getGridName());
         String agencyId = gridInfoResult.getData().getParentAgencyId();
         //获取客户下用户积分
         List<BizPointUserTotalDetailDTO> list = getGridPointList(tokenDto.getCustomerId(), null);