Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcResiUserController.java

@@ -55,7 +55,9 @@ public class IcResiUserController {
      * @date 2021/10/28 10:29 上午
      */
     @PostMapping("detail")
-    public Result queryIcResiDetail(@RequestBody IcResiDetailFormDTO pageFormDTO){
+    public Result queryIcResiDetail(@LoginUser TokenDto tokenDto,@RequestBody IcResiDetailFormDTO pageFormDTO){
+        //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        pageFormDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(pageFormDTO,IcResiDetailFormDTO.AddUserInternalGroup.class);
         return new Result().ok(icResiUserService.queryIcResiDetail(pageFormDTO));
     }