Merge branch 'div'

yujian

2019-02-27 9d401723afe4fd680f60f97b8d927efea6344a6f

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java

@@ -36,6 +36,11 @@
   public int updateByPrimaryKey(UserSystemCouponRecord record) {

      return userSystemCouponRecordMapper.updateByPrimaryKey(record);

   }

	
   @Override

   public List<UserSystemCouponRecord>  getRecordByState(Long uid, Integer state) {

      return userSystemCouponRecordMapper.getRecordByState(uid, state);

   }



   @Override

   public UserSystemCouponRecord  getRecordByOrderNo(String orderNo, Integer state) {