Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -63,7 +63,7 @@
    */
   Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,

         @Param("startTime") String startTime, @Param("endTime") String endTime);
         @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("day") Integer day);

   /**
    * 奖金订单数量