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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

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

@@ -161,4 +161,12 @@
    * @return

    */

   BigDecimal countCommissionByDate(@Param("preDay") String preDay);

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