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

yujian

2020-05-11 712fb305d6f79961e879a2f543107e19d7f9e8a2

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