Merge remote-tracking branch 'origin/master'

admin

2019-03-20 7d8c89145a33d0fcaf7b2c3f8136f7515e070559

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java

@@ -102,11 +102,15 @@


   @Override

   public UserExtraTaoBaoInfo getByRelationId(String relationId) {

      if (StringUtil.isNullOrEmpty(relationId))

         return null;

      return userExtraTaoBaoInfoMapper.selectByRelationIdWithUidNotNull(relationId);

   }



   @Override

   public UserExtraTaoBaoInfo getBySpecialId(String specialId) {

      if (StringUtil.isNullOrEmpty(specialId))

         return null;

      return userExtraTaoBaoInfoMapper.selectBySpecialIdWithUidNotNull(specialId);

   }