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

admin

2020-02-27 be05279bfbc10defc002d7718f46a49f3c96d05e

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java

@@ -85,7 +85,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void save(PushCoupon record) throws PushCouponException,Exception {

      if (record == null) {

         throw new PushCouponException(1, "参数不正确");

@@ -153,7 +153,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void executePush(Long id) throws Exception, PushCouponException, PushException {



      PushCoupon pushCoupon = selectByPrimaryKey(id);