Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/SystemCouponMapper.java

@@ -22,4 +22,13 @@
    */
   List<SystemCoupon> getCouponListByType(@Param("list")List<String> list);
   
}
   /**
    * 根据类型查询
    * @param type
    * @return
    */
   SystemCoupon getCouponByType(@Param("type") String type);
	
	
}