Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

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

   /**
    * 奖金订单数量