Merge branch 'master' into div

yujian

2019-07-11 876b7917a2ba518ae77ca47f1cd57c58d5e8e84c

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



}