Merge branch 'master' into div

yujian

2019-07-02 572a8ec9a3adac7488395ae86bf875f3175f8d46

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



}