Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 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();



}