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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

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

@@ -202,7 +202,11 @@
   Long countOrderBySourceAndNearDay(@Param("uid") Long uid, @Param("source") int source, @Param("day") int day);
   
   
	
	
   /**
    * 统计历史订单数量 -不区分状态、来源  订单号为主
    * @param uid
    * @return
    */
   Long countHistoryOrderNum(@Param("uid") Long uid);
   
}