Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 0d6ae37c7f09949199d84e20a927b44294f7fa9f

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponRecordService.java

@@ -10,7 +10,7 @@


   public int insert(PushCouponRecord record);



   public int insertSelective(PushCouponRecord record);

   public int insertSelective(PushCouponRecord record) throws Exception;



   public PushCouponRecord selectByPrimaryKey(Long id);