冲突

src/main/java/com/qmrb/system/controller/BarnRecordController.java

@@ -130,11 +130,7 @@ public class BarnRecordController {
             @Parameter(description = "岗亭端停车记录ID") @PathVariable Long id,
             @ParameterObject Boolean isMonthlyCardMode
     ) {
-<<<<<<< Updated upstream
     	BarnRecordForm formData = barnRecordService.getCarParkUseLogOrder(id,isMonthlyCardMode);
-=======
-        BarnRecordForm formData = barnRecordService.getCarParkUseLogOrder(id);
->>>>>>> Stashed changes
         return Result.success(formData);
     }