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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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