Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-22 f0ca7d146e94c08dd1b79388e405813b1777c145

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

@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
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.dto.*;
import org.springframework.web.bind.annotation.RequestBody;

@@ -78,4 +81,6 @@
    * @return
    */
   AjaxResult stopCharging(String id);

    PageInfo<ChargingOrderVO> chargingOrder(ChargingOrderQuery dto);
}