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

yujian

2020-04-14 f4d4486e55b91ab2d6313c48dbe8500c3928e8fa

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperBannerServiceImpl.java

@@ -68,7 +68,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {

      

      List<Long> listPicID = new ArrayList<Long>();