Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-22 a49acae90960af1f7f30ba7cf0cc9bda8d6e4e93

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -62,4 +62,20 @@
    * @return
    */
   AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach);
	
	
   /**
    * 获取充电中的详情
    * @param id
    * @return
    */
   ChargingDetails getChargingDetails(Integer id);
	
	
   /**
    * 停止充电
    * @param id
    * @return
    */
   AjaxResult stopCharging(String id);
}