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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java

@@ -192,4 +192,12 @@
   public List<CountOrderTrackRate> getOrderTrackRate(int type, Date startTime, Date endTime);



   

   /**
    * 查询最近50小于10的订单数量
    * @param uid
    * @return
    */
   public Integer countOderByUidAndLess10(Long uid);

	
}