Merge remote-tracking branch 'origin/master'

yujian

2019-03-12 0efbe2adcf4c0c7c2a925a3dcea74f4ff96f94fb

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