Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

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