Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yj

2020-03-13 2f2860b50f24e5e3598d223db03d43df61d95c97

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

@@ -207,7 +207,7 @@
    * @param list 类型

    * @return

    */

   long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,

   Long countValidOrderByUidAndTime(@Param("uid") Long uid, @Param("limitTime") long limitTime,

         @Param("payment") BigDecimal payment);