Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java

@@ -22,6 +22,6 @@
    * @param uid
    * @return
    */
   List<PushCouponRecord> listByUid( @Param("uid") Long uid);
   List<PushCouponRecord> listByUid(@Param("uid") Long uid);
   
}