From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TBPidService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TBPidService.java
index 8b2836a..16f0444 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TBPidService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TBPidService.java
@@ -35,5 +35,11 @@
 	 * @return
 	 */
 	public TBPid getTBPid(Long uid, int type);
+	
+	/**
+	 * 鑾峰彇鍒嗕韩鐢ㄧ殑PID
+	 * @return
+	 */
+	public ClientTBPid getSharePid();
 
 }

--
Gitblit v1.8.0