Merge remote-tracking branch 'origin/master'

admin

2019-02-27 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponRecordMapper.java

@@ -16,6 +16,15 @@
    * @param listCouponId
    * @return
    */
   List<UserSystemCouponRecord> getRecordByState(@Param("uid") Long uid, @Param("state") Integer state);
	
   /**
    * 根据单个订单查询
    * @param uid
    * @param activated
    * @param listCouponId
    * @return
    */
   UserSystemCouponRecord getRecordByOrderNo(@Param("orderNo") String orderNo, @Param("state") Integer state);