Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-29 befe4a62e799c89c73c0b774c000c300bcc2ca18

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -211,7 +211,7 @@
    */
   @ResponseBody
   @PostMapping("/getChargingPileById/{id}")
   public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
   public R<TChargingPile> getChargingPileById(@PathVariable("id") Integer id){
      TChargingPile chargingPile = chargingPileService.getById(id);
      return R.ok(chargingPile);
   }