解决冲突

mitao

2024-05-22 bfd33f437b2165c1e36d5439a0866a557a6dc42e

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java

@@ -1,7 +1,8 @@
package com.ruoyi.order.service;

import com.ruoyi.order.domain.pojo.Order;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.pojo.Order;
import com.ruoyi.system.api.domain.dto.OrderDTO;

/**
 * <p>