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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

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