From bfd33f437b2165c1e36d5439a0866a557a6dc42e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 22 五月 2024 10:02:14 +0800
Subject: [PATCH] 解决冲突

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
index 5ad8367..0e25900 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
+++ b/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>

--
Gitblit v1.7.1