Merge branch 'mater-1.6.0' into div

admin

2019-08-26 dee14e78ad573d7488975a990476e16990bb6376

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

   }