Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-26 9f35dc84a6af0a9019e5ae2c8ac4b2c8e2c99fe9

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java

@@ -37,6 +37,13 @@
     * @param chargingGunId 充电枪id
     * @return
     */
    @GetMapping(value = "/t-charging-order/getOrderDetailByGunId")
    @PostMapping(value = "/t-charging-order/getOrderDetailByGunId")
    R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId);

    /**
     * 获取用户最近使用车辆充电的车辆id
     * @return
     */
    @GetMapping(value = "/t-charging-order/getCar")
    public R<Long> getCar();
}