解决冲突

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -50,17 +50,7 @@ public class OrderController extends AbstractController {
                                       String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
         return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime);
     }
-
-<<<<<<< HEAD
-    @GetMapping("excelOrder")
-    @ApiOperation("导出卡密列表")
-    public void excelOrder(Integer status, String phone, Long shopId, String userName,
-                           String orderNumber, Integer orderType, String shopName, String riderPhone,
-                           String startTime, String endTime, HttpServletResponse response) throws Exception {
-        ExcelData excelData = appOrderService.excelAllOrderAdmin(status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime);
-        ExportExcelUtils.exportExcel(response, "订单列表.xlsx", excelData);
-    }
-=======
+    
 //    @GetMapping("excelOrder")
 //    @ApiOperation("导出卡密列表")
 //    public void excelOrder(Integer status, String phone, Long shopId, String userName,
@@ -69,7 +59,6 @@ public class OrderController extends AbstractController {
 //        ExcelData excelData = appOrderService.excelAllOrderAdmin(status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime);
 //        ExportExcelUtils.exportExcel(response,"订单列表.xlsx",excelData);
 //    }
->>>>>>> 828630e600a93dcf45aee58f07e9447c672db999
 
     @ApiOperation("完成订单")
     @PostMapping(value = "accomplishOrder")