Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserExtraTaoBaoInfoMapper.java

@@ -1,5 +1,7 @@
package com.yeshi.fanli.dao.mybatis.user;

import java.util.List;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

@@ -44,5 +46,12 @@
    * @return
    */
   UserExtraTaoBaoInfo selectBySpecialIdWithUidNotNull(String specialId);
	
   /**
    * 统计正在使用的该淘宝的用户
    */
   List<UserExtraTaoBaoInfo> listByTaoBaoUid(String taoBaoUid);
	
	

}