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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java

@@ -14,7 +14,7 @@


   public int updateByPrimaryKey(UserSystemCouponRecord record);



   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);

   public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer source, Integer state);



   public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list);