From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
index b635e24..a3e6348 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.management.dto.OrderQuery;
-import com.ruoyi.management.vo.TOrderVO;
+import com.ruoyi.goods.api.model.OrderQuery;
+import com.ruoyi.goods.api.model.TOrderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,6 +18,6 @@
*/
public interface TOrderMapper extends BaseMapper<TOrder> {
- List<TOrderVO> listAll(@Param("req") OrderQuery query);
+
}
--
Gitblit v1.7.1