Merge remote-tracking branch 'origin/master'

xuhy

2024-09-09 65a706a1095e49f1ee5f884e0520da7cc55d052b

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java

@@ -63,7 +63,11 @@
   @PostMapping("/offlineParkingInOrder")
   public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
      parkingOrderService.offlineParkingInOrder(order);
      return BaseResponse.ok();
      OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
      offlineParkingResponse.setCode(0);
      offlineParkingResponse.setTakeover(0);
      offlineParkingResponse.setIsfree(false);
      return offlineParkingResponse;
   }
   
   
@@ -75,7 +79,11 @@
   @PostMapping("/offlineParkingOutOrder")
   public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
      parkingOrderService.offlineParkingOutOrder(order);
      return BaseResponse.ok();
      OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
      offlineParkingResponse.setCode(0);
      offlineParkingResponse.setTakeover(0);
      offlineParkingResponse.setIsfree(false);
      return offlineParkingResponse;
   }