Merge branch 'master' into div

yujian

2019-07-12 e2741d692b5d2e382ae3159a131d54a9ca75aa6f

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



}