From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/OperateUserMapper.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/mapper/OperateUserMapper.java b/src/main/java/com/moral/mapper/OperateUserMapper.java
index b8b4008..28844cb 100644
--- a/src/main/java/com/moral/mapper/OperateUserMapper.java
+++ b/src/main/java/com/moral/mapper/OperateUserMapper.java
@@ -1,11 +1,16 @@
package com.moral.mapper;
-import org.apache.ibatis.annotations.Mapper;
-
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.OperateUser;
-import com.moral.entity.OperateUserExample;
+import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface OperateUserMapper extends BaseMapper<OperateUser, OperateUserExample, Integer> {
+import java.util.List;
+
+public interface OperateUserMapper extends BaseMapper<OperateUser> {
+
+ List<OperateUser> findOperateUserList();
+
+ Long findOperateUserCount();
+
+ int deleteOperateUserList(@Param("ids") String[] ids);
}
\ No newline at end of file
--
Gitblit v1.8.0