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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoBuyRelationMapServiceImpl.java

@@ -21,7 +21,7 @@
   @Resource

   private TaoBaoBuyRelationMapMapper taoBaoBuyRelationMapMapper;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public String getRelationId(Long uid) throws TaoBaoBuyRelationMapException {

      TaoBaoBuyRelationMap relationMap = taoBaoBuyRelationMapMapper.selectByUid(uid);