解决冲突

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/ScanRecordController.java

@@ -3,7 +3,7 @@ package cn.com.ty.lift.business.maintenance.controller;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.ScanRecord;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordDetailRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.ScanRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
@@ -66,7 +66,7 @@ public class ScanRecordController {
      * @return 维保记录详情
      */
     @PostMapping("maintenance/record/detail")
-    public RestResponse detail(@RequestBody MaintenanceRecordDetailRequest request) {
+    public RestResponse detail(@RequestBody MaintenanceRecordRequest request) {
         MaintenanceRecord record = maintenanceRecordService.detail(request.getId());
         if (ObjectUtil.isEmpty(record)) {
             return RestResponse.success();