From 33a603f2c8abe311fae3c84b0e54067580cc088c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 24 四月 2020 16:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java
index b4fec49..af3aaf8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPInfoService.java
@@ -22,7 +22,6 @@
 	 */
 	public void addUserVIPInfo(UserVIPInfo info) throws UserVIPInfoException;
 
-
 	/**
 	 * 鏄惁涓篤IP
 	 * 
@@ -30,8 +29,7 @@
 	 * @return
 	 */
 	public boolean isVIP(Long uid);
-	
-	
+
 	/**
 	 * 鍦ㄦ煇涓椂闂存槸鍚︿负VIP
 	 * @Title: isVIP
@@ -42,7 +40,7 @@
 	 * boolean 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public boolean isVIP(Long uid,Long time);
+	public boolean isVIP(Long uid, Long time);
 
 	/**
 	 * 鏍规嵁UID妫�绱�
@@ -58,8 +56,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public Map<Long,Boolean> listByUids(List<Long> uid);
-
+	public Map<Long, Boolean> listByUids(List<Long> uid);
 
 	/**
 	 * 寰呭鏍稿垪琛�
@@ -71,7 +68,6 @@
 	public List<UserVIPInfo> listQuery(int page, int count, String key, Integer state);
 
 	public long countQuery(String key, Integer state);
-
 
 	/**
 	 * 瓒呯骇浼氬憳鐢宠閫氳繃
@@ -95,4 +91,14 @@
 	 */
 	public void applyVIP(Long uid) throws UserVIPInfoException;
 
+	/**
+	 * 鏍规嵁涓婚敭鍒犻櫎
+	 * @Title: deleteByPrimaryKey
+	 * @Description: 
+	 * @param id 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void deleteByPrimaryKey(Long id);
+
 }

--
Gitblit v1.8.0