From 444c51801401d91b15184bfa0ea79574e5712c9a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:31:09 +0800
Subject: [PATCH] 冲突提交

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ForbiddenUserIdentifyCodeService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ForbiddenUserIdentifyCodeService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ForbiddenUserIdentifyCodeService.java
index 357267a..66a53f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ForbiddenUserIdentifyCodeService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ForbiddenUserIdentifyCodeService.java
@@ -1,8 +1,11 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.List;
+
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
 import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
 import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
+import com.yeshi.fanli.vo.user.ForbiddenUserIdentifyCodeVO;
 
 public interface ForbiddenUserIdentifyCodeService {
 
@@ -36,4 +39,25 @@
 	 */
 	public void delete(ForbiddenUserIdentifyCode identifyCode);
 
+	/**
+	 * 鏌ヨ宸插皝绂佺殑鍙风爜   鐢ㄦ埛淇℃伅
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @param type
+	 * @return
+	 */
+	public List<ForbiddenUserIdentifyCodeVO> listQuery(long start, int count, String key, Integer type);
+
+	public long countQuery(String key, Integer type);
+
+	/**
+	 * 瀵硅处鍙峰皝绂併�佽В灏佹搷浣�
+	 * @param identifyCode 鍙风爜
+	 * @param type  绫诲瀷   
+	 * @param state  鐘舵�侊細 true 灏�
+	 * @throws ForbiddenUserIdentifyCodeException
+	 */
+	public void saveForbiddenInfo(String identifyCode, Integer type, boolean state) throws ForbiddenUserIdentifyCodeException;
+
 }

--
Gitblit v1.8.0