去掉合并明细的接口

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

@@ -11,7 +11,6 @@ import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Slf4j
 @RestController
@@ -137,11 +135,4 @@ public class CarrierSettlementOwnerController {
         settlementOwnerService.mergeOwnerSettlement(param);
         return Result.ok();
     }
-
-    @ApiOperation(value = "结算单合并明细",notes = "<br>By:刘海泉")
-    @GetMapping("/settlementMergeDetail")
-    public Result<List<SettlementMergeDetailVO>> settlementMergeDetail(@ApiParam("结算单号") @NotNull(message = "结算单号不能为空") String settlementNo) {
-        List<SettlementMergeDetailVO> list  = settlementOwnerService.settlementMergeDetail(settlementNo);
-        return Result.ok(list);
-    }
 }