冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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