From 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 25 Jun 2025 16:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/dao/UserPositionMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/dao/UserPositionMapper.java b/src/main/java/com/nq/dao/UserPositionMapper.java
index cc4f68e..26e86e3 100644
--- a/src/main/java/com/nq/dao/UserPositionMapper.java
+++ b/src/main/java/com/nq/dao/UserPositionMapper.java
@@ -10,7 +10,7 @@
public interface UserPositionMapper extends BaseMapper<UserPosition> {
int deleteByPrimaryKey(Integer paramInteger);
- int insert(UserPosition paramUserPosition);
+// int insert(UserPosition paramUserPosition);
int insertSelective(UserPosition paramUserPosition);
@@ -35,7 +35,7 @@
List listByAgent(@Param("positionType") Integer paramInteger1,
@Param("state") Integer paramInteger2,
@Param("userId") Integer paramInteger3,
- @Param("searchId") Integer paramInteger4, @Param("positionSn")
+ @Param("ids") List<Integer> ids, @Param("positionSn")
String paramString, @Param("beginTime") Date paramDate1, @Param("endTime") Date paramDate2,
@Param("phone") String phone
);
--
Gitblit v1.9.3