冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

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

   }