Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

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

@@ -112,7 +112,7 @@
    * @return
    */
   Map<String, Object> countBonusOrderMoneyAndNumber(@Param("uid") Long uid, @Param("type") Integer type,
         @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime);
         @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source")Integer source);

   int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);