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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDGoodsServiceImpl.java

@@ -110,7 +110,7 @@
   }



   @Override

   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Cacheable(value = "pddSpecialCache", key = "'specialSearch-'+#page+'-'+#cid")

   public List<PDDGoodsDetail> specialSearch(Integer page, Long cid) throws PDDOrderException {

      if (cid == null) {