From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
index 1ada57c..6ba9a43 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
@@ -16,7 +16,7 @@
*/
public interface StructureTestObjectMapper extends BaseMapper<StructureTestObject> {
- IPage<PageTestObjectDto> selectTestObjectList(Page page, @Param("ew") QueryWrapper<PageTestObjectDto> ew, @Param("partNo") String partNo);
+ IPage<PageTestObjectDto> selectTestObjectList(Page page, @Param("ew") QueryWrapper<PageTestObjectDto> ew);
}
--
Gitblit v1.9.3