Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

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

@@ -18,6 +18,7 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import org.springframework.web.bind.annotation.RequestBody;

import java.time.LocalDate;
import java.util.List;
@@ -268,4 +269,12 @@
   EndOfChargePageInfo getEndOfChargePageInfo(String id);

   Long countNoTag();
	
	
   /**
    * 获取订单数据
    * @param order
    * @return
    */
   List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
}