代码合并错误

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

@@ -8,12 +8,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.GridMemberStatsFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
 import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
@@ -271,13 +265,5 @@ public class EpmetUserController {
         return new Result<CustomerStaffResultDTO>().ok(epmetUserService.getStaffInfo(staffId));
     }
 
-    @GetMapping("export/staffpatroll")
-    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
-        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        formDTO.setUserId(tokenDto.getUserId());
-        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
-        List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
-        ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
-    }
 
 }