Merge remote-tracking branch 'origin/dev' into dev

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/ChargingHandshakeController.java

@@ -29,7 +29,7 @@
    */
   @PostMapping("/getDataByOrderCode")
   public R<ChargingHandshake> getDataByOrderCode(@RequestParam("code") String code){
      ChargingHandshake chargingHandshake = chargingHandshakeService.findById(code);
      ChargingHandshake chargingHandshake = chargingHandshakeService.getDataByOrderCode(code);
      return R.ok(chargingHandshake);
   }
}