Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserExtraTaoBaoInfoService.java

@@ -56,4 +56,17 @@
    */

   public void bindTaoBaoOrderEnd6Num(String taoBaoUid, String orderId);



   /**

    * 通过渠道ID查询用户（用户信息不为空）

    * @param relationId

    * @return

    */

   public UserExtraTaoBaoInfo getByRelationId(String relationId);



   /**

    * 通过会员运营ID查询用户（用户信息不为空）

    * @param specialId

    * @return

    */

   public UserExtraTaoBaoInfo getBySpecialId(String specialId);

}