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

 Conflicts:

	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -63,6 +63,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;

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);