解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -665,7 +665,7 @@ public class JpStationController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/jpstationReportExport", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "电站日报表导出", notes = "电站日报表导出")
+    @ApiOperation(httpMethod = "GET", value = "电站报表导出", notes = "电站报表导出")
     public void jpstationReportExport( @RequestParam(required = false)String time,@RequestParam(required = false) List<String> snCodes, HttpServletResponse response,String type) {
         List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
         List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
@@ -675,7 +675,7 @@ public class JpStationController extends BaseController {
         List<JpStationDto> jpStationDtos = jpStationServiceImpl.selectReportDate(time, snCodes, type);
         try {
             setResponseHeadForDowload(response,"电站报表.xls");
-            EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器日报表").doWrite(jpStationDtos);
+            EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表").doWrite(jpStationDtos);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }