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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -28,7 +28,7 @@
   }



   @Override

   public int insertSelective(PushCouponRecord record) {

   public int insertSelective(PushCouponRecord record) throws Exception{

      return pushCouponRecordMapper.insertSelective(record);

   }