From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/dao/UserMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/dao/UserMapper.java b/src/main/java/com/nq/dao/UserMapper.java
index 60f7634..d7d1a9d 100644
--- a/src/main/java/com/nq/dao/UserMapper.java
+++ b/src/main/java/com/nq/dao/UserMapper.java
@@ -5,6 +5,7 @@
import com.nq.pojo.User;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
@@ -28,7 +29,7 @@
List listByAgent(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2);
- List listByAdmin(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2);
+ List listByAdmin(@Param("realName") String paramString1, @Param("phone") String paramString2, @Param("searchId") Integer paramInteger1, @Param("accountType") Integer paramInteger2,@Param("isLock") Integer isLock,@Param("isLogin") Integer isLogin,@Param("regTime") String regTime,@Param("isActive") Integer isActive);
int CountUserSize(Integer paramInteger);
--
Gitblit v1.9.3