Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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



}