Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-02-07 22aba721f5498d42156885d0e9e596c41f426d71

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

@@ -176,13 +176,7 @@
    * 停止充电返回账单后计算费用
    * @param vo
    */
   void endChargeBillingCharge(TransactionRecordMessageVO vo);
	
//   /**
//    * 停止充电返回账单后计算费用
//    * @param vo
//    */
//   void endChargeBillingCharge1(TransactionRecordMessageVO vo);
   R endChargeBillingCharge(TransactionRecordMessageVO vo);