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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -265,15 +265,13 @@ public class IcUserDemandRecController {
      * @throws Exception
      */
     @PostMapping("analysis-export")
-    public Result analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception {
+    public void analysisExport(HttpServletResponse response,@LoginUser TokenDto tokenDto, @RequestBody PageListAnalysisFormDTO formDTO)throws Exception {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setPageFlag(false);
         PageData<DemandRecResultDTO> res=icUserDemandRecService.pageListAnalysis(formDTO);
         if (!CollectionUtils.isEmpty(res.getList())) {
             ExcelUtils.exportExcelToTarget(response, null, res.getList(), DemandRecExcelResultDTO.class);
-            return new Result();
         }
-        return new Result();
     }
 
     /**