Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-24 34c21f1c938ba3659c5d50201a0e64f747ee4545

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

@@ -7,6 +7,7 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.RequestBody;

@@ -82,5 +83,5 @@
    */
   AjaxResult stopCharging(String id);

    PageInfo<ChargingOrderVO> chargingOrder(ChargingOrderQuery dto);
   TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
}