From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index 84feedf..f24e8d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -94,11 +94,11 @@
List<UserInfoVO> query(@Param("start") long start, @Param("count") int count, @Param("userState") Integer userState,
@Param("key") String key, @Param("keyType") Integer keyType, @Param("userRank") String userRank,
@Param("days") Integer days, @Param("startTime") String startTime, @Param("endTime") String endTime,
- @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode);
+ @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode,@Param("userType") Integer userType);
long queryCount(@Param("userState") Integer userState, @Param("key") String key, @Param("keyType") Integer keyType,
@Param("userRank") String userRank, @Param("days") Integer days, @Param("startTime") String startTime,
- @Param("endTime") String endTime);
+ @Param("endTime") String endTime,@Param("userType") Integer userType);
/**
* 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
--
Gitblit v1.8.0